Remove conflict markers.

58ccf243 · Juanma Barranquero · 51d28d3e · 58ccf243
Commit 58ccf243 authored Apr 24, 2010 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

src/ChangeLog src/ChangeLog +1 -6

No files found.
--- 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)