[SCM] kexi packaging branch, master, updated. 833d6bf4cbfd9192c6527f5cad5e5e9247414ebe

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/kexi.git;a=commitdiff;h=dc78c3b

The following commit has been merged in the master branch:
commit dc78c3b01de6ac452be7cf4c280ff194600403a6
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 24 13:28:27 2017 +0200

    add a simple .gitattributes file
---
 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

-- 
kexi packaging