Skip to content

Commit c7b4b59

Browse files
Merge pull request GoogleCloudPlatform#3631 from GoogleCloudPlatform/fix_HEAD
fix: fix merge error on golden test file
2 parents 4cbb076 + 9a27af2 commit c7b4b59

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

pkg/test/resourcefixture/testdata/basic/managedkafka/v1alpha1/managedkafkacluster/managedkafkacluster-cmek/_generated_object_managedkafkacluster-cmek.golden.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ status:
3636
observedGeneration: 2
3737
observedState:
3838
createTime: "1970-01-01T00:00:00Z"
39-
name: projects/${projectId}/locations/us-central1/clusters/managedkafkacluster-${uniqueId}
4039
state: ACTIVE
4140
updateTime: "1970-01-01T00:00:00Z"

0 commit comments

Comments
 (0)