Mercurial > hg > xemacs-beta
diff src/toolbar-xlike.h @ 5459:413bf5efaedb
Remove leftover conflict markers.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Sun, 24 Apr 2011 00:15:47 +0900 |
parents | fce43cb76a1c |
children | 2aa9cd456ae7 |
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Sun, 24 Apr 2011 00:15:47 +0900 |
parents | fce43cb76a1c |
children | 2aa9cd456ae7 |