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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4ec6169655d12f66a6b25373e7e090838041efec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 28 11:53:37 2015 +0200

    Add a gbp configuration to keep the branches unmerged
---
 debian/gbp.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f2d86d5
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+merge = False
+overlay = True

-- 
ktp-common-internals packaging