From d3c325a0094ea21f1ac45df7ae307cc8faf70e89 Mon Sep 17 00:00:00 2001
From: Michal Ludvig <mludvig@suse.cz>
Date: Wed, 22 May 2002 12:56:58 +0000
Subject: [PATCH] Removed forgotten conflict indicators

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3cba45564f4..26f314ddc05 100644
--- 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.
-- 
2.47.2