From: Adam A.G. Shamblin <adam.shamblin@imulus.com>
Date: Mon, 14 Jul 2014 22:53:23 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/coyote240/dotfiles
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=15831303e616908fc122a92636542d0799d099a7;p=dotfiles.git

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

15831303e616908fc122a92636542d0799d099a7
diff --cc dotvimrc
index 61811a7,8e1da2f..bb595f6
--- a/dotvimrc
+++ b/dotvimrc
@@@ -25,8 -25,8 +25,9 @@@ filetype plugin indent o
  autocmd FileType make setlocal noexpandtab
  
  au BufNewFile,BufRead *.json set filetype=javascript
 +au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
+ au BufNewFile,BufRead *.less set filetype=less
  au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
  au BufWritePost *.py call Flake8()
  au BufWritePost *.js :JSHint