projects / ocaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 521207c)
Prepare merge with master branch
authorStephane Glondu <steph@glondu.net>
Mon, 2 Dec 2013 17:33:44 +0000 (18:33 +0100)
committerStephane Glondu <steph@glondu.net>
Mon, 2 Dec 2013 17:53:00 +0000 (18:53 +0100)
debian/gbp.conf patch | blob | history

diff --git a/debian/gbp.conf b/debian/gbp.conf
index dfa07a01a6012034ff4fa0eeab26adf993e8eb81..cec628c7444886870d72dc8bcd536479e7f8a284 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = experimental/upstream
-debian-branch = experimental/master
Unnamed repository; edit this file 'description' to name the repository.