diff src/m/ibmrs6000.h @ 5459:413bf5efaedb

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