comparison lwlib/xlwscrollbar.h @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents 8de8e3f6228a
children ade4c7e2c6cb
comparison
equal deleted inserted replaced
5401:4486ba63476b 5459:413bf5efaedb