Missed a conflict marker.

jimingham · jimingham · commit eb078e02c2cc · 2024-03-13T09:28:14.000-07:00
diff --git a/lldb/test/API/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py
@@ -214,7 +214,6 @@ def test(self):
             33,
             "Got the right value",
         )
->>>>>>> 3707c540d23a (Make ValueObject::Cast work for casts from smaller to larger structs in the cases where this currently can work. (#84588))
 
         # Check that lldb.value implements truth testing.
         self.assertFalse(lldb.value(frame0.FindVariable("bogus")))

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@ def test(self):`
`214`	`214`	`33,`
`215`	`215`	`"Got the right value",`
`216`	`216`	`)`
`217`		`->>>>>>> 3707c540d23a (Make ValueObject::Cast work for casts from smaller to larger structs in the cases where this currently can work. (#84588))`
`218`	`217`
`219`	`218`	`# Check that lldb.value implements truth testing.`
`220`	`219`	`self.assertFalse(lldb.value(frame0.FindVariable("bogus")))`