From 8fc73efa209b189cc85b6ba249069e706629d8f6 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Fri, 12 Apr 2013 17:33:59 -0400
Subject: [PATCH] merge fix

---
 .vimrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.vimrc b/.vimrc
index 7f2e535..f1c84dc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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)}'
 
 
-
 " ** STATUSLINE **
 "
 set laststatus=2