[Pkg-samba-maint] [samba] 01/12: gbp.conf: change debian-branch to stretch, and merge-mode to merge

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch stretch
in repository samba.

commit fd2156f9e4cfb888e35e1c3a6d6afe5b3e7e134f
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Jul 27 11:53:36 2017 +0200

    gbp.conf: change debian-branch to stretch, and merge-mode to merge
---
 debian/gbp.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index db0c253..74ea46f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -13,4 +13,5 @@ filter = [
   '*chm',
   ]
 filter-pristine-tar = True
-debian-branch = master
+debian-branch = stretch
+merge-mode = merge

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git