From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Mon, 7 Jul 2014 03:09:30 +0000 (-0600)
Subject: Merge, fix conflicts.
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=e1a9c5e49fee8bb16648808a19d95be74435be51;p=dotfiles.git

Merge, fix conflicts.
---

e1a9c5e49fee8bb16648808a19d95be74435be51
diff --cc dotvimrc
index 527da0a,a1d6824..8e1da2f
--- a/dotvimrc
+++ b/dotvimrc
@@@ -22,8 -26,7 +26,8 @@@ autocmd FileType make setlocal noexpand
  
  au BufNewFile,BufRead *.json set filetype=javascript
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
 +au BufNewFile,BufRead *.less set filetype=less
- au BufNewFile,BufRead *.md setlocal textwidth=80
+ au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
  au BufWritePost *.py call Flake8()
  au BufWritePost *.js :JSHint