[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-182-gc9db060

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=c9db060

The following commit has been merged in the master branch:
commit c9db060dcca12f93827a674540a4d07e69b404ee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Apr 13 17:57:17 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-common-internals packaging