From: Edward Delaporte <edthedev@gmail.com>
Date: Fri, 20 Mar 2015 02:21:26 +0000 (-0500)
Subject: Merge branches 'master' and 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/b9efb54625e9a1ff50331a0344d2687ed17c2c34?ds=sidebyside;hp=--cc

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

Conflicts:
	vimrc
---

b9efb54625e9a1ff50331a0344d2687ed17c2c34
diff --cc vimrc
index e15d54c,8b20a7a..3e91fed
--- a/vimrc
+++ b/vimrc
@@@ -129,7 -130,7 +129,7 @@@ let g:PyLintOnWrite = 
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913'
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1101,E1120,R0201,R0901,R0903,R0904,R0913,E1002,E1103'
  " let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0631,E1002,E1101,E1103,E1120,R0201,R0901,R0903,R0904,R0913'
- let g:PyLintDissabledMessages = 'C0103,C0111,C0301,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
 -let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
++let g:PyLintDissabledMessages = 'C0103,C0111,C0301,C0322,C0323,C0324,W0141,W0142,W0212,W0221,W0223,W0232,W0401,W0613,W0621,W0631,E0611,E1002,E1101,E1103,E1120,F0401,R0201,R0901,R0903,R0904,R0913'
  
  Plugin 'edthedev/arduino.vim'
  " Plugin 'edthedev/vim-arduino-ino'
@@@ -144,8 -145,9 +144,11 @@@ Plugin 'edthedev/cmd.vim
  Plugin 'itchyny/thumbnail.vim'
  " :Thumbnail
  "
- Plugin 'farseer90718/vim-taskwarrior'
- let g:task_rc_override = 'defaultwidth=999'
+ " Plugin 'farseer90718/vim-taskwarrior'
++" let g:task_rc_override = 'defaultwidth=999'
++" Plugin 'farseer90718/vim-taskwarrior'
+ " let g:task_rc_override = 'defaultwidth=0'
+ " let g:task_report_name     = 'list'
  " Read up on it here:  https://github.com/farseer90718/vim-taskwarrior
  "