[SCM] kdialog packaging branch, master, updated. d113a30f07d045435e66679472cd973e2e9d3641

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1c0d6f68432d7ba14128b84e374719e11f4825a9
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 17 20:41:37 2017 +0100

    add a .gitattributes
---
 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

-- 
kdialog packaging