Merge branch 'master' of ssh://gitlab.isnet.uk:666/dotfiles/vim

This commit is contained in:
ManjaroOne666 2018-02-25 18:09:26 +00:00
commit a422ca6fe5
1 changed files with 4 additions and 0 deletions

4
vimrc
View File

@ -161,7 +161,11 @@ nnoremap <leader>ry diw"0P
inoremap jk <esc> inoremap jk <esc>
<<<<<<< HEAD
nnoremap A :call Checksemicolon()<CR> nnoremap A :call Checksemicolon()<CR>
=======
nnoremap A :call Checksemicolon()<CR>;
>>>>>>> 069785d16d3aa092bc735cec086bfe37301aa198
nnoremap <leader>co :!clear; nnoremap <leader>co :!clear;
nnoremap <leader>gs :!clear; git status<CR> nnoremap <leader>gs :!clear; git status<CR>