Mercurial > hg > xemacs-beta

changeset 5459:413bf5efaedb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents 4486ba63476b
children 82e220b08ace
files src/ChangeLog
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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):