You know, resolving some conflicts...

This commit is contained in:
2013-12-28 12:39:39 -05:00
parent 3bd64cb384
commit 507145b0db
2 changed files with 2 additions and 2 deletions

View File

@@ -16,7 +16,7 @@
receivepack = true
[push]
default = tracking
default = matching
[color]
ui = auto