diff src/ChangeLog.GTK @ 5459:413bf5efaedb

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