From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/transproxy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/transproxy') diff --git a/package/transproxy/Makefile b/package/transproxy/Makefile index 1fa705257..2db965c71 100644 --- a/package/transproxy/Makefile +++ b/package/transproxy/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 02cc1160a9db9c49a40491f890083044 PKG_DESCR:= transparent HTTP proxy PKG_SECTION:= proxy -PKG_DEPENDS:= iptables kmod-ip-nf-target-redirect +PKG_DEPENDS:= iptables PKG_URL:= http://sourceforge.net/projects/transproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=transproxy/1.6/} -- cgit v1.2.3