From: Andreas Schwab <schwab@suse.de>
Date: Fri, 3 Jun 2005 14:18:31 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: emacs-pretest-22.0.90~9349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=774a1a1a82a8e8004ffa4b4d2e477432f8df8476;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b098adbf548..bbb091c5cc7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.