[SCM] ark packaging branch, master, updated. debian/4.14.2-1-30-gfda9e84

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ark.git;a=commitdiff;h=3be2b6d

The following commit has been merged in the master branch:
commit 3be2b6dfa5d4dd81ce5a32ed9df183cb88ce6daa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 23 14:40:45 2015 +0100

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
ark packaging