[SCM] charmtimetracker packaging branch, master, updated. debian/1.11.4-2-4-g6bdb26c

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit ab50c515bed210b4fd320ce439ad3b7cf4d29b33
Author: Sandro Knauß <hefee at debian.org>
Date:   Mon Oct 23 11:06:24 2017 +0200

    Add a .gitattributes file to use dpkg-mergechangelogs
---
 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

-- 
charmtimetracker packaging