comparison lisp/emacs-lisp/copyright.el @ 62560:56541edc86ad

Remove CVS conflict markers.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 20 May 2005 17:47:03 +0000
parents 39dc00cd1f8a
children 18a818a2ee7c f042e7c0fe20
comparison
equal deleted inserted replaced
62559:36a36b2ac60d 62560:56541edc86ad