From f09fbbf73c955f7c05a0c039eb705daeecc3571f Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 18 Feb 2013 00:15:31 -0800
Subject: [PATCH] merge

---
 .gvimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gvimrc b/.gvimrc
index 97525bd..6660b3e 100644
--- a/.gvimrc
+++ b/.gvimrc
@@ -1,7 +1,7 @@
 winsize 115 45
 "set expandtab
-"set guifont=DejaVu\ Sans\ Mono:h15.00
-set guifont=Inconsolata\ 14
+set guifont=DejaVu\ Sans\ Mono\ 12
+"set guifont=Inconsolata:h18.00
 set guioptions-=L
 
 if has("gui_macvim")