resolve conflicts

ocofaigh · ocofaigh · commit 7abd1c834ff6 · 2025-06-25T22:35:26.000+01:00
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 1cf0dafd08adb8c4450f6110fbb6163efb02f43b
+Subproject commit 403ef31b0757e3b5819313709a12e72c48f4384b
diff --git a/tests/resources/main.tf b/tests/resources/main.tf
@@ -81,4 +81,4 @@ module "ocp_base" {
   worker_pools                        = local.worker_pools
   access_tags                         = []
   disable_outbound_traffic_protection = true
-}
+}
