merge conflict

HGWright · Nov 9, 2023 · 056defa · 056defa
2 parents 875f827 + e942b32
commit 056defa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/iris/tests/unit/common/metadata/test_CoordMetadata.py b/lib/iris/tests/unit/common/metadata/test_CoordMetadata.py
@@ -83,6 +83,10 @@ def setUp(self):
             attributes=sentinel.attributes,
             coord_system=sentinel.coord_system,
             climatological=sentinel.climatological,
+<<<<<<< HEAD
+=======
+            guess_coord=sentinel.guess_coord,
+>>>>>>> e942b321af9292b1826de69a3ee6ab98109b0cd0
         )
         self.dummy = sentinel.dummy
         self.cls = CoordMetadata
@@ -261,6 +265,10 @@ def setUp(self):
             attributes=sentinel.attributes,
             coord_system=sentinel.coord_system,
             climatological=sentinel.climatological,
+<<<<<<< HEAD
+=======
+            guess_coord=sentinel.guess_coord,
+>>>>>>> e942b321af9292b1826de69a3ee6ab98109b0cd0
         )
         self.dummy = sentinel.dummy
         self.cls = CoordMetadata

diff --git a/lib/iris/tests/unit/coords/test_Coord.py b/lib/iris/tests/unit/coords/test_Coord.py
@@ -1159,12 +1159,10 @@ def coord():
 
 class Test_ignore_axis:
     def test_default(self, coord):
-
         assert coord.ignore_axis is False
 
     def test_set_true(self, coord):
         coord.ignore_axis = True
-
         assert coord.ignore_axis is True
 
     def test_set_random_value(self, coord):