From: Edward Delaporte <edthedev@gmail.com>
Date: Mon, 9 Mar 2015 21:36:51 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/6ec9bafb8ea448b7a1dd4499994787e0df51f96b

Merge branch 'master' of https://github.com/edthedev/dotfiles

Conflicts:
	vimrc
---

6ec9bafb8ea448b7a1dd4499994787e0df51f96b
diff --cc vimrc
index a7ee5c0,3998d1d..3cd2797
--- a/vimrc
+++ b/vimrc
@@@ -146,8 -146,7 +146,9 @@@ Plugin 'itchyny/thumbnail.vim
  " :Thumbnail
  "
  " Plugin 'farseer90718/vim-taskwarrior'
 +" let g:task_rc_override = 'defaultwidth=0'
 +" let g:task_report_name     = 'list'
+ " let g:task_rc_override = 'defaultwidth=999'
  " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
  "