diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 18:56:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 18:56:08 -0400 |
| commit | 1285763015bb357297f573031cc3793d17fa702c (patch) | |
| tree | 832437c924c8d539706c729e6e0af8d260f80ae1 /.gitattributes | |
| parent | ad3770e0b203b32a07fa142d6d83c980b23310ee (diff) | |
decruft
Diffstat (limited to '.gitattributes')
| -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 |