decruft
This commit is contained in:
parent
ad3770e0b2
commit
1285763015
1 changed files with 0 additions and 2 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1,3 +1 @@
|
|||
debian/changelog merge=dpkg-mergechangelogs
|
||||
.git-annex/*.log merge=union
|
||||
.git-annex/*/*/*.log merge=union
|
||||
|
|
Loading…
Reference in a new issue