From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/privoxy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/privoxy') diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile index 6b529c19a..d0220a1cb 100644 --- a/package/privoxy/Makefile +++ b/package/privoxy/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_VARIANT:= stable PKG_MD5SUM:= 57acc79059565cc42eda67982842785d PKG_DESCR:= web proxy with advanced filtering capabilities -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= libpthread libpcre PKG_BUILDDEP:= pcre PKG_URL:= http://www.privoxy.org/ -- cgit v1.2.3