[SCM] konsole packaging branch, master, updated. debian/4.14.2-1-52-g037b5c4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3b147efd4e6d9f1a3717d13c8b70a6cfa2ed3714
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 24 07:40:12 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

-- 
konsole packaging