This commit is contained in:
Joey Hess 2010-10-14 03:47:06 -04:00
parent 50630840ee
commit 7117702fdd

1
.gitattributes vendored
View file

@ -1 +0,0 @@
.git-annex/*.log merge=union