summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorApollon Oikonomopoulos <apoikos@debian.org>2018-03-22 12:09:43 +0200
committerApollon Oikonomopoulos <apoikos@debian.org>2018-03-22 14:10:21 +0200
commitc148ce45683e59945493447f3ee4a7e01bf753ba (patch)
tree56b7965386b3badc38e64e575a1f76eda2ecfa00
parentd743a9f20e62a77d129b604e87da5a221e68aaaa (diff)
d/gbp.conf: restore branch names
Git-Dch: ignore
-rw-r--r--debian/gbp.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b34a6d88961..b3ca37ea1c0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = experimental
-upstream-branch = upstream-exp
+debian-branch = master
+upstream-branch = upstream
[import-orig]
filter = ['debian/*','lib/*']