stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Austen Adler 2014-07-30 13:03:23 -04:00
parent b98730f6f9
commit 0b55930f13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vimrc
View File

@ -2,8 +2,8 @@ let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
if has('conceal') if has('conceal')
set conceallevel=2 concealcursor=i set conceallevel=2 concealcursor=i
endif endif
nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/=/= nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
command! W %!sudo tee > /dev/null % command! WW %!sudo tee > /dev/null %
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
autocmd FileType * :hi IndentGuidesOdd guibg=red ctermbg=239 autocmd FileType * :hi IndentGuidesOdd guibg=red ctermbg=239
autocmd FileType * :hi IndentGuidesEven guibg=white ctermbg=239 autocmd FileType * :hi IndentGuidesEven guibg=white ctermbg=239