projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ef23d7)
remove stray <<<<< from CVS
authorJim Kingdon <jkingdon@engr.sgi.com>
Fri, 24 Dec 1993 19:05:23 +0000 (19:05 +0000)
committerJim Kingdon <jkingdon@engr.sgi.com>
Fri, 24 Dec 1993 19:05:23 +0000 (19:05 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 30a362bc9e7f6837877235b2f9d0741b94120b2d..94d33fbc84918c7be35b457d9de56cb4e9219098 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -191,7 +191,6 @@ Mon Nov 29 11:36:57 1993  Stu Grossman  (grossman at cygnus.com)
        * i386ly-tdep.c (i386lynx_saved_pc_after_call):  Change call_inst
        to unsigned char to avoid domain warning for some values.
 
->>>>>>> 1.2024
 Mon Nov 22 23:42:59 1993  Steve Chamberlain  (sac@jonny.cygnus.com)
 
        * remote-e7000.c (e7000_wait): Cope with H8/300 register dump.