[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/0.7.0-1-100-g985a5d1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=e7c8acd

The following commit has been merged in the master branch:
commit e7c8acd6d3754d7acbc538fdc2d73a9fb228903f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Apr 13 17:57:18 2016 +0200

    Add a basic gbp conf file
---
 debian/gbp.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..9828eda
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[import-orig]
+merge = True

-- 
ktp-filetransfer-handler packaging