Merge pull request #1230 from vespa-engine/thomasht86/fix-merge-conflict-syntax

fix syntax

Author: thomasht86

tests/integration/test_integration_vespa_cloud.py

@@ -647,7 +647,6 @@ def tearDown(self) -> None:
         self.vespa_cloud.delete(instance=self.instance, environment=self.environment)
 
 
-<<<<<<< ean/expose-experimental-private-servics
 @unittest.skip(
     "This test relies on a fixed deployment with private services, which may not always be available."
 )
@@ -671,7 +670,8 @@ def test_get_private_services(self):
         self.assertIsInstance(result, dict)
         # assert 'privateServices' key exists and is a list
         self.assertIn("privateServices", result)
-=======
+
+
 # @unittest.skip("Creates cloud resources — run manually to verify vault access flow")
 @unittest.skip(
     "Requires interactive (Auth0) login — API key auth cannot set vault access rules. "
@@ -750,4 +750,3 @@ def test_deploy_with_secrets(self):
 
     def tearDown(self) -> None:
         self.vespa_cloud.delete()
->>>>>>> master