# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1303571747 -32400
# Node ID 413bf5efaedb46e7262593cf7d2ccc4805a6fdb4
# Parent  4486ba63476b3cb139e197da3a5ecedf2cc08100
Remove leftover conflict markers.

diff -r 4486ba63476b -r 413bf5efaedb src/ChangeLog
--- a/src/ChangeLog	Sun Apr 17 16:27:02 2011 -0400
+++ b/src/ChangeLog	Sun Apr 24 00:15:47 2011 +0900
@@ -94,8 +94,6 @@
 	* unicode.c (Funicode_precedence_list): "occurrance" -> "occurrence".
 	* window.c (struct window_mirror_stats): "Ancilliary" -> "Ancillary".
 
-=======
->>>>>>> other
 2011-03-20  Mats Lidell  <matsl@xemacs.org>
 
 	* alloca.c (find_stack_direction):