jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing vimrc conflict

Browse Source
This commit is contained in:
jon
2019-03-17 12:44:10 -05:00
parent 38ad193ba7
commit f60c3d165c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vim/.vimrc
View File

@@ -59,7 +59,6 @@ nnoremap <C-k> <C-W><C-K>
nnoremap <C-l> <C-W><C-L> nnoremap <C-l> <C-W><C-L>
nnoremap <C-h> <C-W><C-H> nnoremap <C-h> <C-W><C-H>
<<<<<<< HEAD
" provide movements in Insert mode via the <Alt> modifier key " provide movements in Insert mode via the <Alt> modifier key
inoremap <Esc>h <C-o>h inoremap <Esc>h <C-o>h
inoremap <Esc>j <C-o>j inoremap <Esc>j <C-o>j
@@ -71,14 +70,12 @@ inoremap <Esc>x <C-o>x
" fix alt meta mappings in rxvt " fix alt meta mappings in rxvt
"inoremap <A-h> <ESC>a "inoremap <A-h> <ESC>a
=======
" H/L for beginning/end " H/L for beginning/end
noremap H ^ noremap H ^
noremap L $ noremap L $
noremap ^ H noremap ^ H
noremap $ L noremap $ L
>>>>>>> 416cffd7d3c524d9cd24b9ec0186fa0e169d700a
" map ctrl-p to fzf " map ctrl-p to fzf
nnoremap <C-p> :Files<CR> nnoremap <C-p> :Files<CR>