[pynac] 01/04: Add d/.gitattributes for merging

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository pynac.

commit 03e4d35d142ebbb8c735daeced4209d210199dcd
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Aug 18 14:28:33 2017 +0200

    Add d/.gitattributes for merging
---
 debian/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pynac.git