Skip to content

Commit 1edf717

Browse files
committed
last merge conflict
1 parent 570a8c3 commit 1edf717

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

mmv1/products/securesourcemanager/Instance.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,16 @@ examples:
8181
'deletion_policy': '"DELETE"'
8282
ignore_read_extra:
8383
- 'update_time'
84-
<<<<<<< HEAD
8584
- 'deletion_policy'
86-
=======
8785
- name: 'secure_source_manager_instance_private_trusted_cert'
8886
primary_resource_id: 'default'
8987
primary_resource_name: 'fmt.Sprintf("tf-test-my-instance%s", context["random_suffix"])'
9088
vars:
9189
instance_id: 'my-instance'
9290
ignore_read_extra:
9391
- 'update_time'
92+
- 'deletion_policy'
9493
exclude_docs: true
95-
>>>>>>> 87b4ef0a14e7b29a18b81105f3ccd7e2d894a278
9694
- name: 'secure_source_manager_instance_private'
9795
primary_resource_id: 'default'
9896
primary_resource_name: 'fmt.Sprintf("tf-test-my-instance%s", context["random_suffix"])'

0 commit comments

Comments
 (0)