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/dansguardian/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dansguardian') diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 5264f7d7b..55ee3d634 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.12.0.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 2a88d0392cd28eaec02b7ee727b2e253 PKG_DESCR:= web content filter proxy -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= pcre zlib PKG_URL:= http://dansguardian.org/ -- cgit v1.2.3