summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2017-08-03 14:09:10 -0400
committerDavid Bremner <bremner@debian.org>2017-08-03 14:09:10 -0400
commitd8298d8c8b959385d64016ec82bfa38b88c043c3 (patch)
treee09f427358549f44350f181d709108894e65f8bd /.gitattributes
parentbe6a4385e1393eb6f3709903e0f4146d47c91e17 (diff)
parent65259a660973184678a24e8e06aee836a84d4579 (diff)
Record dh-elpa (1.10) 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