Remove merge marker :-)

llvm-svn: 374414
2019-10-10 18:30:47 +00:00 · 2019-10-10 18:30:47 +00:00 · e9529a942a
parent cae2662104
commit e9529a942a
1 changed files with 0 additions and 4 deletions
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
@ -376,7 +376,3 @@ class BreakpointSerialization(TestBase):
                self.assertEqual(copy_value, "second_value")
            else:
                self.Fail("Unknown key: %s"%(key))
-<<<<<<< HEAD
-=======
-
->>>>>>> Die, TABS, die, die, die, die...