conflicts

This commit is contained in:
Barak Michener 2013-03-21 10:44:30 -07:00
commit 04029b0eef
8 changed files with 248 additions and 86 deletions

View file

@ -1,7 +1,7 @@
winsize 115 45
"set expandtab
"set guifont=DejaVu\ Sans\ Mono:h15.00
set guifont=Inconsolata\ 12
set guifont=Inconsolata\ 14
set guioptions-=L
set guioptions-=r