From 9e2ac2d4612c413fc694ba293ede442cae70f24b Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Mon, 2 Dec 2013 18:33:44 +0100 Subject: [PATCH] Prepare merge with master branch --- debian/gbp.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index dfa07a01..cec628c7 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,2 @@ [DEFAULT] pristine-tar = True -upstream-branch = experimental/upstream -debian-branch = experimental/master -- 2.30.2