Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2016-12-08 13:53:47 +01:00

4
vimrc
View File

@@ -309,8 +309,8 @@ nnoremap <leader>g :IndentGuidesToggle<CR>
"" Ultisnips "" Ultisnips
let g:UltiSnipsExpandTrigger="<c-j>" let g:UltiSnipsExpandTrigger="<c-j>"
let g:UltiSnipsJumpForwardTrigger="<c-l>" let g:UltiSnipsJumpForwardTrigger="<c-j>"
let g:UltiSnipsJumpBackwardTrigger="<c-h>" let g:UltiSnipsJumpBackwardTrigger="<c-k>"
" Tex " Tex