Removed forgotten conflict indicators

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3cba45564f402f8fd1331bd6b5f7b91d98adf594..26f314ddc05c9031225b7c4228e16db50ae967b4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -48,7 +48,6 @@
        * x86-64-tdep.c (x86_64_skip_prologue): Print note when debugging
        code without frame pointers.
 
->>>>>>> 1.2298.2.45
 2002-04-25  Andrew Cagney  <ac131313@redhat.com>
 
        * README: Update to GDB 5.2.