[Emacs-diffs] /srv/bzr/emacs/trunk r100026: Remove conflict markers.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100026
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-04-24 14:33:31 +0200
message:
  Remove conflict markers.
modified:
  src/ChangeLog

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-24 11:11:40 +0000
+++ b/src/ChangeLog     2010-04-24 12:33:31 +0000
@@ -58,12 +58,7 @@
 
 2010-04-23  Eli Zaretskii  <address@hidden>
 
-       Support `display' text properties and overlay strings in bidi
-       buffers.
-=======
-2010-04-23  Eli Zaretskii  <address@hidden>
-
->>>>>>> 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)