summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2011-04-19 12:35:37 +0200
committerGravatar Stephane Glondu <steph@glondu.net>2011-04-19 12:35:37 +0200
commit4b1c150e26881501db9aa944df6406150fc0670d (patch)
tree8a65cfa6ed1d45a41cf05a9072fb72f597327e20
parent853081b70ac141ffcbde0cf468b6f45c62f0a964 (diff)
Promote 8.3 branch to master branch
-rw-r--r--debian/gbp.conf2
1 files changed, 0 insertions, 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