Skip to content
Browse files

decruft

  • Loading branch information...
1 parent ad3770e commit 1285763015bb357297f573031cc3793d17fa702c @joeyh committed
Showing with 0 additions and 2 deletions.
  1. +0 −2 .gitattributes
View
2 .gitattributes
@@ -1,3 +1 @@
debian/changelog merge=dpkg-mergechangelogs
-.git-annex/*.log merge=union
-.git-annex/*/*/*.log merge=union

0 comments on commit 1285763

Please sign in to comment.
Something went wrong with that request. Please try again.