Code cleanup

MarcinOrlowski · Sep 14, 2021 · ba01ba9 · ba01ba9
1 parent c31bcf9
commit ba01ba9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/prop/test_file.py b/tests/prop/test_file.py
@@ -314,10 +314,6 @@ def _check_written_content(self, propfile: PropFile, verify_file_name, save_file
                     expected.append(item.to_string())
 
                 fh = manager()
-<<<<<<< HEAD
-=======
-
->>>>>>> 3055eb66200087fdc2e5f50204cfcc5e24f77c2b
                 # FIXME: LF/CRLF should be configurable
                 fh.write.assert_called_once_with('\n'.join(expected))