Remove spurious conflict indicators.

OVS: ----------------------------------------------------------------------

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de161de50d420348725d865495a656883d307c3a..b53d1b70778a88870f6788ab14c8e9eba80c3b84 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -591,7 +591,6 @@
        * target.c (unpush_target): Close target after unpushing it, not
        before.
 
->>>>>>> 1.13788
 2012-01-19  Gary Benson  <[email protected]>
 
        * mdebugread.c (sort_blocks): Replace integer constants with ones
@@ -632,7 +631,6 @@
        record breakpoints list.  Only remove breakpoints from the
        inferior if they had been inserted there in the first place.
 
->>>>>>> 1.13749
 2012-01-17  Doug Evans  <[email protected]>
 
        * linespec.c (decode_line_internal): Don't call symtabs_from_filename