From c4c31f17e89fa407e9477e00bd4a6f3d7e034f4d Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me+cygwin@cgf.cx>
Date: Thu, 30 Jan 2003 01:42:01 +0000
Subject: remove conflict marker

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e1cd54a..48280c3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -336,7 +336,6 @@
 	(_initialize_infcmd): Update help string for 'until' command.
 	Add new 'advance' command.
 
->>>>>>> 1.3752
 2003-01-14  David Carlton  <carlton@math.stanford.edu>
 
 	* linespec.c (decode_line_1): Normalize comments.
-- 
cgit v1.1