[SCM] yakuake packaging branch, master, updated. debian/3.0.2-1-6-g50d7f0f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/yakuake.git;a=commitdiff;h=b56fca2

The following commit has been merged in the master branch:
commit b56fca216021d93a70c3adee6f10a1e3fe309fc0
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 3 15:56:03 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

-- 
yakuake packaging