From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 22 Sep 2007 01:57:23 +0000 (+0000)
Subject: Delete conflict markers.
X-Git-Tag: emacs-pretest-23.0.90~10739
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e644166a78f32b7bf3e22852d675883fb1755045;p=emacs.git

Delete conflict markers.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c076ffb14ad..25615d3c41f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3606,12 +3606,8 @@
 
 	* replace.el (match): Use yellow1 instead of yellow.
 
-<<<<<<< ChangeLog
 	* progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of
 	red.
-=======
-	* progmodes/gdb-ui.el (breakpoint-enabled): Use red1 instead of red.
->>>>>>> 1.11807
 
 	* pcvs-info.el (cvs-unknown): Likewise.