helps if you save the ChangeLog after you edit it and before you check it in

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e76325ff3b80be083b791b4080422cd22c2debdb..15bfd73bf58ecf4c7a3e331a4e4c0e8470bdb2e2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,10 +1,9 @@
-<<<<<<< ChangeLog
 Tue Jun  8 14:42:10 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
 
        * Move config/m68k/tm-m68k.h (FRAME_FIND_SAVED_REGS) to
        m68k-tdep.c (m68k_find_saved_regs).  Don't duplicate code between
        68881 and non-68881 cases.  Check for a pair of movel instructions.
-=======
+
 Tue Jun  8 14:52:55 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        First cut at sparc-vxworks targetting.
@@ -14,7 +13,6 @@ Tue Jun  8 14:52:55 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
        * remote-eb.c, remote.c: symfile.h requires bfd.h so include it.
 
 Tue Jun  8 14:42:10 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
->>>>>>> 1.1342
 
        * config/m68k/xm-news.h: add "extern int errno".