From 774a1a1a82a8e8004ffa4b4d2e477432f8df8476 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Fri, 3 Jun 2005 14:18:31 +0000
Subject: [PATCH] Remove conflict marker.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.
-- 
2.39.5