dotfiles

commit 8ab2ac4a82f843ee02a1401483cc5aff84907e12
parent 086722d92829ba207755fc69760f0c8ff19250ef
Author: andersuno <anders.hedman01@gmail.com>
Date:   Fri, 24 Jan 2020 02:05:39 +0100

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

Diffstat:
M
.config/nvim/init.vim
 | 
9
---------

1 file changed, 0 insertions(+), 9 deletions(-)
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
@@ -19,15 +19,9 @@ 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>
@@ -35,12 +29,9 @@ inoremap [] []<Left>
 inoremap {} {}<Left>
 inoremap <> <><Left>
 
-<<<<<<< HEAD
 " show whitespace
 set list
 
-=======
->>>>>>> f6d16600147178ccd4002c42a666a22dca7047ee
 " Enable folding
 set foldmethod=indent
 set foldlevel=99