fix inventory after merge

2026-03-04 13:19:37 +00:00
parent a67583ec45
commit f2fd4ecd37
1 changed files with 0 additions and 8 deletions
--- a/tests/fast/stages/s0_org_setup/simple.yaml
+++ b/tests/fast/stages/s0_org_setup/simple.yaml
@@ -2953,10 +2953,6 @@ counts:
  google_logging_organization_sink: 3
  google_logging_project_bucket_config: 3
  google_logging_project_settings: 2
-<<<<<<< HEAD
-=======
-  google_monitoring_notification_channel: 1
->>>>>>> origin/master
  google_org_policy_custom_constraint: 1
  google_org_policy_policy: 37
  google_organization_iam_audit_config: 1
@@ -2983,11 +2979,7 @@ counts:
  google_tags_tag_value_iam_binding: 4
  local_file: 9
  modules: 50
-<<<<<<< HEAD
  resources: 325
-=======
-  resources: 327
->>>>>>> origin/master
  terraform_data: 4

 outputs: