[plm] 01/01: normalize our gbp config

[Martin Quinson]

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

mquinson pushed a commit to branch debian
in repository plm.

commit 48734c6c66f8d281e114533822435fb8a9511e36
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Wed Oct 22 22:39:15 2014 +0200

    normalize our gbp config
---
 debian/gbp.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 18a0f96..376abf5 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-upstream-branch=debian-upstream
-debian-branch=debian-debian
+upstream-branch=upstream
+debian-branch=debian

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