diff options
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index b83edcae0..5d425843f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1 @@ debian/changelog merge=dpkg-mergechangelogs -.git-annex/*.log merge=union -.git-annex/*/*/*.log merge=union |