comparison leim/quail/welsh.el @ 84775:8589ca45e3b9

Delete conflict markers.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 22 Sep 2007 01:57:23 +0000
parents 2904684117d6
children 3ca83a726835 f55f9811f5d7
comparison
equal deleted inserted replaced
84774:3c064398f718 84775:8589ca45e3b9