comparison etc/sample.Xresources @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents f15523a6da7a
children 4ed2dedf36a1
comparison
equal deleted inserted replaced
5401:4486ba63476b 5459:413bf5efaedb