Merge branch 'dev' into relation_many_multifield

g3w-suite · Sep 20, 2023 · cb2602d · cb2602d
2 parents da42f87 + 18ada71
commit cb2602d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/g3w-admin/core/tests/test_api.py b/g3w-admin/core/tests/test_api.py
@@ -634,10 +634,6 @@ def testCoreInterfaceOwsView(self):
         self.assertEqual(len(jres['layers']), 21)
 
         self.assertEqual(jres['layers'][1]['title'], 'Acque - AdT Catasto Terreni')
-<<<<<<< HEAD
-        print(jres['layers'][1]['crss'])
-=======
->>>>>>> 18ada713 (Fix test for external wms service.)
         self.assertEqual(len(jres['layers'][1]['crss']), 20)