diff src/general-slots.h @ 5459:413bf5efaedb

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