comparison lisp/s-region.el @ 76254:5ae1368180c3

Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Thu, 01 Mar 2007 13:58:24 +0000
parents e3694f1cb928
children 9355f9b7bbff 95d0cdf160ea
comparison
equal deleted inserted replaced
76253:cd3e9a5647d3 76254:5ae1368180c3