summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2017-01-08 13:28:52 +0000
committerDavid Bremner <bremner@debian.org>2017-01-08 13:28:52 +0000
commit57c13b039f6e580c058acc5d06cfaf7a888adec6 (patch)
tree7278d6642ba53486cb291706feee22198a7efa5e /.gitattributes
parentabf59ab8cb4051cd8d12e7cf6d1168244afb5224 (diff)
parent8216f75ec6442f800ff279a2336a713185ece74d (diff)
Record dh-elpa (1.6) in archive suite sid
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 5d42584..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs