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

Conflicts:
	gitconfig
This commit is contained in:
Arne Schauf committed 2014-07-27 12:33:21 +02:00
commit 2b1c2f41bb
1 file changed
+1 -1
+1 -1
View File
@@ -13,4 +13,4 @@
[color]
ui = true
[core]
excludesfile = ~/.gitignore
excludesfile = ~/.gitignore