[SCM] konqueror packaging branch, master, updated. a1c924c6d81e0f3849d658db138af0f0ae951621

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cbcbecd0fd3ee474e6ca9be9e063d4fc4a2b6361
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 10 10:44:22 2017 +0200

    Add a .gitattributes file to use dpkg-mergechangelogs
---
 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

-- 
konqueror packaging