projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 993f3aa)
remove conflict indicator.
authorDavid Taylor <taylor@redhat.com>
Tue, 27 Feb 2001 21:58:33 +0000 (21:58 +0000)
committerDavid Taylor <taylor@redhat.com>
Tue, 27 Feb 2001 21:58:33 +0000 (21:58 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fcd0eda17e21da846b504666a89d3bb4195b3582..68c3a37b26025fdc2189790f0a702ddb31bc4c0d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -543,7 +543,6 @@ Wed Feb  7 19:41:21 2001  Andrew Cagney  <cagney@redhat.com>
        (fill_fpregset): Likewise.
        (supply_fpregset): Likewise.
 
->>>>>>> 1.973
 Tue Feb  6 11:58:57 2001  David Taylor  <taylor@redhat.com>
 
        * valops.c (value_cast): If casting a scalar to a pointer, do not