Mercurial > hg > xemacs-beta
diff etc/sample.init.el @ 5459:413bf5efaedb
Remove leftover conflict markers.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 24 Apr 2011 00:15:47 +0900 |
| parents | b10161763edf |
| children | 308d34e9f07d |
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 24 Apr 2011 00:15:47 +0900 |
| parents | b10161763edf |
| children | 308d34e9f07d |