From 109f03992de1dca557bb0df62cfd391a0b7ce907 Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@tvrl.net>
Date: Mon, 2 Apr 2012 09:17:30 +0200
Subject: [PATCH] Fixed merge conflicts

---
 vimrc.after | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc.after b/vimrc.after
index 2835cb9eab..f0b5d424bb 100644
--- a/vimrc.after
+++ b/vimrc.after
@@ -121,6 +121,7 @@ let g:tagbar_type_ruby = {
     \ ]
 \ }
 
+"map <LEADER>rt  :TagbarToggle<CR>
 
 if has("gui_macvim")
     let macvim_hig_shift_movement = 1