From: Kevin Buettner <kevinb@redhat.com>
Date: Tue, 24 Feb 2004 22:35:44 +0000 (+0000)
Subject: Remove merge conflict characters.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=063cb53aac70316b12d3097f11615d358f529eef;p=binutils-gdb.git

Remove merge conflict characters.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01e8152b919..f0c47cddb88 100644
--- 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