dotfiles

andersuno dotfiles
Log | Files | Refs

commit 086722d92829ba207755fc69760f0c8ff19250ef
parent 7f5a9ae50d7822db36821d6c3bc57f6b55f2eb25
Author: andersuno <anders.hedman01@gmail.com>
Date:   Fri, 24 Jan 2020 01:55:24 +0100

Merge branch 'master' of http://github.com/andersuno/dotfiles

 Changes to be committed:
	modified:   .config/nvim/init.vim

Diffstat:
M.config/nvim/init.vim | 9+++++++++
1 file changed, 9 insertions(+), 0 deletions(-)

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim @@ -19,9 +19,15 @@ set wildmenu set wildmode=list:longest,full "set cursorline "set ruler +<<<<<<< HEAD :command-bang Q q :command-bang W w :command-bang WQ wq +======= +:command Q q +:command W w +:command WQ wq +>>>>>>> f6d16600147178ccd4002c42a666a22dca7047ee inoremap "" ""<Left> inoremap '' ''<Left> inoremap () ()<Left> @@ -29,9 +35,12 @@ inoremap [] []<Left> inoremap {} {}<Left> inoremap <> <><Left> +<<<<<<< HEAD " show whitespace set list +======= +>>>>>>> f6d16600147178ccd4002c42a666a22dca7047ee " Enable folding set foldmethod=indent set foldlevel=99