# HG changeset patch
# User Per Abrahamsen <abraham@dina.kvl.dk>
# Date 1013103220 0
# Node ID 3d510ec26d695d8dfada71e9fecd67433d94c703
# Parent  6dab4dad009309f8c43f1181b1d1d5a470ea09b4
fix conflict

diff -r 6dab4dad0093 -r 3d510ec26d69 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 07 17:32:18 2002 +0000
+++ b/lisp/ChangeLog	Thu Feb 07 17:33:40 2002 +0000
@@ -1,8 +1,3 @@
-2002-02-05  Per Abrahamsen  <abraham@dina.kvl.dk>
-
-	* cus-edit.el (customize-mark-to-save): New function.
-	* menu-bar.el (menu-bar-options-save): Rewrote.
-
 2002-02-06  Kim F. Storm  <storm@cua.dk>
 
 	* help.el (where-is): Report remapped commands.
@@ -89,7 +84,11 @@
 	* gud.el (gud-refresh): Call recenter only after we are sure we
 	are in the right window.
 
->>>>>>> 1.3415
+2002-02-05  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* cus-edit.el (customize-mark-to-save): New function.
+	* menu-bar.el (menu-bar-options-save): Rewrote.
+
 2002-02-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* cus-start.el (x-use-underline-position-properties):