diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-03 16:48:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-03 16:48:04 +0000 |
| commit | b7185a731cf3b899cd001e35e886467cb1ee8318 (patch) | |
| tree | 72f5a81fd9cd34550c835a4da56c9dff6df3e485 /lisp/loadup.el | |
| parent | 2fe32d09ebec4fabaacd995fcae46d82b9188625 (diff) | |
| download | emacs-b7185a731cf3b899cd001e35e886467cb1ee8318.tar.gz | |
* loadup.el: Fix merge problem, only load "button" once.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 1 |
1 files changed, 0 insertions, 1 deletions
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") |