From e9529a942a76a9247fb94613c7d5ae482fe22adf Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 10 Oct 2019 18:30:47 +0000 Subject: Remove merge marker :-) llvm-svn: 374414 --- .../breakpoint/serialize/TestBreakpointSerialization.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py index a015de64890..7a04fa3c288 100644 --- 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... -- cgit v1.2.3