# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1412871263 14400
# Node ID 1d8a6e9e96a5a9329ee714c21041890e5c90292d
# Parent  9f92bbf310618c9bedafc143eebad4319647a27e# Parent  7808b6e38ae290a560da625fe6f4a1b4626d3414
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -410,7 +410,7 @@ if has('gui_running')
     set columns=120 lines=40
   end
 
-  colorscheme solarized
+  colorscheme jellybeans
 else
 
   if $TERM =~ 'screen'