Merge branch 'local'

Conflicts: vim/vimrc
2013-02-27 10:52:34 +00:00
parent 6753dec90f f41ff09d65
commit a1952316db
3 changed files with 26 additions and 3 deletions
@@ -24,7 +24,7 @@ set wildignore=*.swp,*.bal,*.pyc,*.class
 set title
 set visualbell
 set noerrorbells
-"set nowritebackup
+set nowritebackup
 set nobackup
 set noswapfile
 filetype plugin indent on
@@ -62,8 +62,7 @@ if has("gui_running")
    set stal=2
    set toolbar=
    set guioptions-=T
-    set columns=84
-    colorscheme solarized
+"    set columns=84
 endif

 colorscheme default