From 0b55930f139da176abc626bff27f46aebd2b029c Mon Sep 17 00:00:00 2001
From: Austen <stonewareslord@gmail.com>
Date: Wed, 30 Jul 2014 13:03:23 -0400
Subject: [PATCH] Fixed merge conflict

---
 vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimrc b/vimrc
index 3fbe354..5a4313f 100644
--- a/vimrc
+++ b/vimrc
@@ -2,8 +2,8 @@ let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
 if has('conceal')
   set conceallevel=2 concealcursor=i
 endif
-nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/=/=
-command! W %!sudo tee > /dev/null %
+nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
+command! WW %!sudo tee > /dev/null %
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 autocmd FileType * :hi IndentGuidesOdd guibg=red ctermbg=239
 autocmd FileType * :hi IndentGuidesEven guibg=white ctermbg=239