From: Stephane Glondu <steph@glondu.net>
Date: Mon, 2 Dec 2013 17:33:44 +0000 (+0100)
Subject: Prepare merge with master branch
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~183
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9e2ac2d4612c413fc694ba293ede442cae70f24b;p=ocaml.git

Prepare merge with master branch
---

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