From 43c41783a826eef9ed91d87c360f9b798d417f41 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Thu, 29 Apr 2004 22:37:53 +0000
Subject: [PATCH] Remove >>>>> from someones long-ago commit.

---
 gdb/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37dd1db..5380102 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -345,7 +345,6 @@
 
 	* rs6000-tdep.c (registers_e500, registers_7400): Doc fixes.
 
->>>>>>> 1.5719
 2004-04-19  Daniel Jacobowitz  <drow@mvista.com>
 
 	* dwarf2read.c (dwarf2_tmp_obstack, dwarf2_free_tmp_obstack):
-- 
2.7.4