[SCM] ksystemlog packaging branch, master, updated. debian/4.14.0-1-15-gfc98a84

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ksystemlog.git;a=commitdiff;h=86ba9a9

The following commit has been merged in the master branch:
commit 86ba9a99e83d91cb622f758c72b7163a1e1e44ad
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 19 21:42:31 2015 +0100

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
ksystemlog packaging