# HG changeset patch
# User Per Abrahamsen <abraham@dina.kvl.dk>
# Date 1013507860 0
# Node ID a0316e8e7bf0c1b0cd4be4247ac58f1f188d7b98
# Parent  bccb026d40e418e5a969771f990a7c7f3ab3970a
merge fix

diff -r bccb026d40e4 -r a0316e8e7bf0 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 12 09:49:46 2002 +0000
+++ b/lisp/ChangeLog	Tue Feb 12 09:57:40 2002 +0000
@@ -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)