# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1420752156 18000
# Node ID 76cd5cf09b44be5012bcc10e68d7ff2bcea67166
# Parent  c7a9cd793e37beb959889dd8040c4cf8ab357c7d# Parent  08af9e123baa001dab960bf1fd6474c0a9225907
Merge.

diff --git a/.emacs b/.emacs
--- a/.emacs
+++ b/.emacs
@@ -7,7 +7,7 @@
 ; Start the server so that emacsclient will work
 (server-start)
 
-(setq custom-file "~/.elisp/settings/99.custom.el")
+(setq custom-file "~/.elisp/settings/01.custom.el")
 
 (let ((settings-files (concat (getenv "HOME") "/.elisp/settings")))
   (mapc '(lambda (p) (load (concat settings-files "/" p)))