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

b7185a73 · Dan Nicolaescu · 2fe32d09 · b7185a73 · b7185a73
Commit b7185a73 authored Sep 03, 2007 by Dan Nicolaescu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/loadup.el lisp/loadup.el +0 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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")