fixed incorrect merge

saltstack · Dec 11, 2019 · 7e0750d · 7e0750d
1 parent c015e46
commit 7e0750d
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -1341,10 +1341,7 @@ def test_apply_cloud_providers_config_extend_multiple(self):
                 },
             },
         }
-        self.assertEqual(ret, salt.config.apply_cloud_providers_config(
->>>>>>> de3fd871dc... add tencentcloud testing
-            overrides,
-            defaults=DEFAULT))
+        self.assertEqual(ret, salt.config.apply_cloud_providers_config(overrides, defaults=DEFAULT))
 
     def test_apply_cloud_providers_config_extends_bad_alias(self):
         '''