[SCM] syntax-highlighting packaging branch, master, updated. 66a8a7310315d5d1fae4bf12a1e932b3d8a22d28

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/syntax-highlighting.git;a=commitdiff;h=e5f75a9

The following commit has been merged in the master branch:
commit e5f75a9e7b1457df42f36e14b71a587f417c6c23
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Oct 16 11:11:06 2016 +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

-- 
syntax-highlighting packaging