changeset: 5462:413bf5efaedb parent: 5460:4486ba63476b user: Stephen J. Turnbull <stephen(a)xemacs.org&gt; date: Sun Apr 24 00:15:47 2011 +0900 files: src/ChangeLog description: 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(a)xemacs.org&gt; * alloca.c (find_stack_direction): _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches