diff tests/gtk/xemacs-toolbar.el @ 5459:413bf5efaedb

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