From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Fri, 6 Nov 2015 11:39:36 +0000 (+0000)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=ffd156ded0f3b8473c9662815a7edce93035bb21;hp=-c;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

ffd156ded0f3b8473c9662815a7edce93035bb21
diff --combined vimrc
index 1e0b768,eff9b49..b8cb719
--- a/vimrc
+++ b/vimrc
@@@ -15,11 -15,11 +15,11 @@@ Plugin 'zanloy/vim-colors-sunburst
  Plugin 'Lokaltog/vim-distinguished'
  Plugin 'pangloss/vim-javascript'
  Plugin 'Yggdroot/indentLine'
- Plugin 'git@github.com:Raimondi/delimitMate.git'
+ Plugin 'Raimondi/delimitMate'
  Plugin 'scrooloose/syntastic'
  Plugin 'Valloric/YouCompleteMe'
  Plugin 'ternjs/tern_for_vim'
- Plugin 'git@github.com:docunext/closetag.vim.git'
+ Plugin 'docunext/closetag.vim'
  Plugin 'bling/vim-airline'
  Plugin 'airblade/vim-gitgutter'
  Plugin 'tpope/vim-fugitive'
@@@ -77,6 -77,7 +77,6 @@@ let delimitMate_autoclose = 
  
  " latex-box
  let g:LatexBox_quickfix = 4
 -let g:LatexBox_viewer = "apvlv"
  
  " clang fix
  let g:clang_user_options='|| exit0'