From: Richard Yu <redacted>
Date: Mon, 6 May 2019 16:12:22 +0000 (+0800)
Subject: Revert "transmission-web: set conflicts with transmission-web-control"
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6b49b9c56631e71ac2e1d7715113c17fed90332d;p=openwrt-packages.git

Revert "transmission-web: set conflicts with transmission-web-control"

This reverts commit 18c9a03770793e084eab5601d51b21ca4b374f75.

To fix "make menuconfig" shows "recursive dependency detected".

Signed-off-by: Richard Yu <redacted>
---

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index bd6e557cf..bbe073e69 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -86,7 +86,6 @@ define Package/transmission-web
   $(call Package/transmission/template)
   TITLE+= (webinterface)
   DEPENDS:=@(PACKAGE_transmission-daemon-openssl||PACKAGE_transmission-daemon-mbedtls)
-  CONFLICTS:=transmission-web-control
   PKGARCH:=all
 endef