projects / ocaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 362cb2d)
Merge 312 branches
authorStephane Glondu <steph@glondu.net>
Sat, 16 Apr 2011 13:46:19 +0000 (15:46 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 16 Apr 2011 13:46:19 +0000 (15:46 +0200)
debian/gbp.conf patch | blob | history

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