From 58ccf24384c14146d63cb6060c17f1a0e2131b6c Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 24 Apr 2010 14:33:31 +0200 Subject: [PATCH] Remove conflict markers. --- src/ChangeLog | 7 +------ 1 file changed, 1 insertion(+), 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 - Support `display' text properties and overlay strings in bidi - buffers. -======= -2010-04-23 Eli Zaretskii - ->>>>>>> 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) -- 2.39.5