Merge branch 'master' of github.com:ryanc/dotfiles

Conflicts: .vim/vimrc
2012-12-11 07:49:32 -06:00 · 2012-12-11 07:49:32 -06:00 · 16236307ad
commit 16236307ad
parent d84b594001 fb167d887d
1 changed files with 3 additions and 0 deletions
--- a/.hgrc
+++ b/.hgrc
@ -0,0 +1,3 @@
+[ui]
+username = Ryan Cavicchioni <ryan@confabulator.net>
+editor = vim