From 2d91bfd37aefae68a97b62c13788825d5b22d584 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sun, 8 Dec 2019 12:07:45 +0800
Subject: [PATCH] qBittorrent: fix error

---
 package/lean/qBittorrent/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/lean/qBittorrent/Makefile b/package/lean/qBittorrent/Makefile
index bbaa743ecc..225bf123a2 100644
--- a/package/lean/qBittorrent/Makefile
+++ b/package/lean/qBittorrent/Makefile
@@ -6,11 +6,7 @@ PKG_RELEASE=5
 
 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
-<<<<<<< HEAD
 PKG_HASH:=2f367b89d7049c09e808fc5f7c338ce1820d91bcaecddcad681e9ba18b13206d
-=======
-PKG_HASH:=620127f73f88ed3f2b2e4195cbc641f7c27f967d3b045e45f7916c0995fd61fe
->>>>>>> parent of cb0135ff... qBittorrent: bump 4.2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION)