diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ead668a 100644 --- 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