diff --git a/vimrc b/vimrc index fdfa9ed..6a2110a 100644 --- a/vimrc +++ b/vimrc @@ -161,7 +161,11 @@ nnoremap ry diw"0P inoremap jk +<<<<<<< HEAD nnoremap A :call Checksemicolon() +======= +nnoremap A :call Checksemicolon(); +>>>>>>> 069785d16d3aa092bc735cec086bfe37301aa198 nnoremap co :!clear; nnoremap gs :!clear; git status