projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 54a5c8d)
Remove merge conflict characters.
authorKevin Buettner <kevinb@redhat.com>
Tue, 24 Feb 2004 22:35:44 +0000 (22:35 +0000)
committerKevin Buettner <kevinb@redhat.com>
Tue, 24 Feb 2004 22:35:44 +0000 (22:35 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01e8152b919caf9531c3b919adf566b766370f0b..f0c47cddb8859144ddc2cc20faea27470721423e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -70,7 +70,6 @@
        * breakpoint.c (print_one_breakpoint): Do not output spaces
        after printing <PENDING> for a pending breakpoint.
 
->>>>>>> 1.5456
 2004-02-23  Jeff Johnston  <jjohnstn@redhat.com>
 
        * printcmd.c (print_scalar_formatted): Initialize val_long