Author: adrian Date: Thu Oct 10 11:30:47 2019 New Revision: 374414 URL: http://llvm.org/viewvc/llvm-project?rev=374414&view=rev Log: Remove merge marker :-)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py?rev=374414&r1=374413&r2=374414&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py Thu Oct 10 11:30:47 2019 @@ -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... _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits