[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.4-2-9-g7115364

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1eaf285a60ff806fd1e726c31218c83439fe9901
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 19:12:22 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

-- 
subtitlecomposer packaging