diff --git a/vimrc b/vimrc index fb00298..d8d2284 100644 --- a/vimrc +++ b/vimrc @@ -270,9 +270,8 @@ nnoremap tn :ConqueTermTab zsh map c NERDCommenterToggle -" nnoremap Y y$ -inoremap -inoremap +" inoremap +" inoremap " diffput/diffget nnoremap dp :diffput