[SCM] ktp-contact-runner packaging branch, master, updated. debian/0.7.0-1-102-g31a74d7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=31a74d7

The following commit has been merged in the master branch:
commit 31a74d762de40ba08e193a7cdaf598c3a7ec58c1
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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index f2d86d5..9828eda 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,2 @@
-[DEFAULT]
-merge = False
-overlay = True
+[import-orig]
+merge = True

-- 
ktp-contact-runner packaging