From 8acf46ddd41995efb5ab5d6f6aaf9fb6fe61139c Mon Sep 17 00:00:00 2001
From: Per Abrahamsen <abraham@dina.kvl.dk>
Date: Tue, 12 Feb 2002 09:57:40 +0000
Subject: [PATCH] merge fix

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16d6cd9207a..9f16a677bbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -261,7 +261,6 @@
 	* cus-start.el (x-use-underline-position-properties):
 	Allow customization.
 
->>>>>>> 1.3434
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
 	* dired.el (dired-load-hook, dired-mode-hook)
-- 
2.39.2