[SCM] okular packaging branch, master, updated. debian/4%17.08.3-1-3-g7c48dbf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okular.git;a=commitdiff;h=7c48dbf

The following commit has been merged in the master branch:
commit 7c48dbfdb5092242375850dd90eaf453ef2207d0
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 2 22:25:29 2018 +0100

    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

-- 
okular packaging