From cc8a662174c89b18ea39f5096bd48c33f1884d58 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sat, 16 Apr 2011 15:46:19 +0200
Subject: [PATCH] Merge 312 branches

---
 debian/gbp.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d84e16cf..cec628c7 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = 312/upstream
-debian-branch = 312/master
-- 
2.30.2