]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove conflict marker.
authorAndreas Schwab <schwab@suse.de>
Fri, 3 Jun 2005 14:18:31 +0000 (14:18 +0000)
committerAndreas Schwab <schwab@suse.de>
Fri, 3 Jun 2005 14:18:31 +0000 (14:18 +0000)
lisp/ChangeLog

index b098adbf548ee7cee77fc1c2ef74fd58b5e84cb7..bbb091c5cc7e9c99279ece98ff19aaf190f68a06 100644 (file)
@@ -34,7 +34,6 @@
 
        * viper.el (viper-non-hook-settings): Fixed the names of defadvices.
 
->>>>>>> 1.7661
 2005-06-01  Luc Teirlinck  <teirllm@auburn.edu>
 
        * autorevert.el (auto-revert-buffers): Use save-match-data.