[SCM] KDevelop packaging branch, master, updated. debian/4%5.2.0-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop.git;a=commitdiff;h=fae1f55

The following commit has been merged in the master branch:
commit fae1f551659eab14119b5dc267692f889eeaf60c
Author: Pino Toscano <pino at debian.org>
Date:   Thu Nov 16 08:32:29 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

-- 
KDevelop packaging