* loadup.el: Fix merge problem, only load "button" once.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fffb1878ab217b819ea9ae3875fa0262cf8f63d..583e63407e4e1747e30b18dc5bcac89e20afc481 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-03  Emanuele Giaquinta <e.giaquinta@glauco.it>  (tiny change)
+
+       * loadup.el: Fix merge problem, only load "button" once.
+
 2007-09-03  Glenn Morris  <rgm@gnu.org>
 
        * vc-svn.el (vc-svn-print-log): If there is only one file, use

diff --git a/lisp/loadup.el b/lisp/loadup.el
index f9ba4a8164f9b587dadc3b56b8ed8f48ecd594b1..1b96afd5486785aa0a6106adfd0a0a3673bfad08 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -82,7 +82,6 @@
 (message "%s" (garbage-collect))
 (load "simple")
 
-(load "button")
 (load "help")
 
 (load "jka-cmpr-hook")