solving merge conflict

2 files changed, 3 insertions, 2 deletions

diff --git a/vifm/Trash b/vifm/Trash
index 1cbfc17..12c6f49 100644
--- a/vifm/Trash
+++ b/vifm/Trash
diff --git a/vim/vimrc b/vim/vimrc
index f59a944..99d8eb9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -23,6 +23,7 @@ Plugin 'altercation/vim-colors-solarized'
 Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
+syntax on
 
 ""  Configuration  
 
@@ -99,6 +100,7 @@ set tabstop=4
 set softtabstop=4
 set shiftwidth=4
 set autoindent
+set breakindent
 " set cindent
 
 "  Folds
@@ -173,7 +175,6 @@ autocmd! BufNewFile,BufRead,BufWrite * :call UpdateColorscheme()
 
 ""  Custom mappings
 
-
 " General
 nnoremap <Leader>te :tabedit 
 nnoremap <Leader>tn :tabnew<cr>
@@ -189,7 +190,7 @@ nnoremap <Leader>sc :source %
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
 nnoremap J mzJ`z
-nnoremap - za
+" nnoremap - za
 nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>