Permalink
Browse files

Merge branch 'master' of github.com:locojay/locovim

Conflicts:
	vimrc
  • Loading branch information...
2 parents 08826ab + cf36422 commit 8d14482f79609e5982cec5e24550a19744ee132c locojaydev committed Oct 3, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 vimrc
View
@@ -512,6 +512,7 @@ if has('python')
autocmd Filetype python :UltiSnipsAddFiletypes python
autocmd Filetype html :UltiSnipsAddFiletypes html
+ autocmd Filetype c :UltiSnipsAddFiletypes c
endif
" }}}
@@ -776,6 +777,7 @@ if executable("tmux")
" Bundle 'sjl/vitality.vim'
" Save when losing focus
+ " " Save when losing focus
" au FocusLost * :silent! wall
endif

0 comments on commit 8d14482

Please sign in to comment.