From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 3 Sep 2007 16:48:04 +0000 (+0000)
Subject: * loadup.el: Fix merge problem, only load "button" once.
X-Git-Tag: emacs-pretest-23.0.90~11126
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7185a731cf3b899cd001e35e886467cb1ee8318;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fffb1878ab..583e63407e4 100644
--- 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 f9ba4a8164f..1b96afd5486 100644
--- 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")