From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 24 Apr 2010 12:33:31 +0000 (+0200)
Subject: Remove conflict markers.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~397
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58ccf24384c14146d63cb6060c17f1a0e2131b6c;p=emacs.git

Remove conflict markers.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7979e809a9d..5ee4f8c8de1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -58,12 +58,7 @@
 
 2010-04-23  Eli Zaretskii  <eliz@gnu.org>
 
-	Support `display' text properties and overlay strings in bidi
-	buffers.
-=======
-2010-04-23  Eli Zaretskii  <eliz@gnu.org>
-
->>>>>>> MERGE-SOURCE
+	Support `display' text properties and overlay strings in bidi buffers.
 	* xdisp.c (pop_it): When the stack is popped after displaying
 	from a string, bidi-iterate to exit from the text portion covered
 	by the `display' property or overlay.  (Bug#5988, bug#5920)