From 0dbe8613b4f83d0a19e256824d0b1540b40dd85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?=
 <czchen@debian.org>
Date: Sun, 15 Nov 2015 20:21:18 +0800
Subject: [PATCH] Update gbp.conf

---
 debian/gbp.conf | 4 ----
 1 file changed, 4 deletions(-)

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