comparison lisp/emulation/viper-init.el @ 72891:24025d20791a

Fix previous commit: Remove conflict marker. Undo unification of Pavel Janik's name.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 15 Sep 2006 09:03:48 +0000
parents aba79a1f03ed
children 02e5b380f763 694bbb62a75d 6823a91487f2
comparison
equal deleted inserted replaced
72890:5ba1cd1da822 72891:24025d20791a