merge fix

This commit is contained in:
Barak Michener 2013-04-12 17:33:59 -04:00
parent 6bc262623f
commit 8fc73efa20

1
.vimrc
View file

@ -190,7 +190,6 @@ let g:CommandTMaxDepth = 7
"let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}' "let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}'
" ** STATUSLINE ** " ** STATUSLINE **
" "
set laststatus=2 set laststatus=2