Mercurial > hg > xemacs-beta
diff modules/ChangeLog @ 5459:413bf5efaedb
Remove leftover conflict markers.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 24 Apr 2011 00:15:47 +0900 |
| parents | 11ed8768ac4f |
| children | 24c67faf4be6 e79916901603 |
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 24 Apr 2011 00:15:47 +0900 |
| parents | 11ed8768ac4f |
| children | 24c67faf4be6 e79916901603 |