why are all the git checks failing?

story645 · story645 · commit a21c4a87e09d · 2020-05-01T19:33:28.000-04:00
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -1042,7 +1042,6 @@ def test_basic(self):
 
 
 class TestFuncFormatter:
-<<<<<<< HEAD
     tests = [("function, 1 input",
                 (lambda x: f"{x}!", [2], "2!")),
              ("function 2 inputs",
@@ -1067,31 +1066,6 @@ def test_other_builtins(self):
         with pytest.raises(UserWarning, match=r'max is not'):
             mticker.FuncFormatter(max)
 
-=======
-    def test_input_x_pos(self):
-        def func(x, pos):
-            return f"{x}+{pos}"
-        funcform = mticker.FuncFormatter(func)
-        assert "1+2" == funcform(1, 2)
-
-    def text_input_x(self):
-        def func(x):
-            f"hello {x}"
-        funcform = mticker.FuncFormatter(func)
-        assert "hello 0" == funcform(0)
-
-    def test_error(self):
-        with pytest.raises(TypeError, match=r"FuncFormatter*"):
-            def func(x, y, z):
-                " ".join([x, y, z])
-            funcform = mticker.FuncFormatter(func)
-            funcform(1, 2, 3)
-
-    def test_built_in(self):
-        funcform = mticker.FuncFormatter("{} hi!".format)
-        assert "42 hi!" == funcform(42)
->>>>>>> 103314bfb... flake errors
-
 
 class TestStrMethodFormatter:
     test_data = [
