[SCM] KDevelop PHP plugin packaging branch, master, updated. debian/5.1.2-1-4-g3e85219

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 3e852194dbf68d40ab609a50168000733513a7e1
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 11 11:54:18 2017 +0200

    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 PHP plugin packaging