1 files changed, 1 insertions, 6 deletions

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)