diff etc/ChangeLog @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents 0f7d483cff5a
children 04ff11b0e50a e79916901603
line wrap: on
line diff