[SCM] xjadeo/master: debian/gbp.conf: Drop non-defaults options.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 36c0889b115fe5a4be7e2e726846f1576e157a35
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Nov 10 18:59:58 2010 +0100

    debian/gbp.conf: Drop non-defaults options.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 5ca912a..5474c60 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,3 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
 pristine-tar = True
 sign-tags = True

-- 
xjadeo packaging