Update gbp.conf

9 years ago · 0dbe8613b4
parent a818072d84
commit 0dbe8613b4
1 changed files with 0 additions and 4 deletions
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -2,7 +2,3 @@
 debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
-
-[import-orig]
-# Use git cherrypick -n upstream instead.
-merge = False