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/nginx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/nginx/Makefile') diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 5da12f51d..3565b65c7 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.12 PKG_RELEASE:= 1 PKG_MD5SUM:= c21589daaec0743d6d4cdf41503ffd53 PKG_DESCR:= powerful http reverse proxy and webserver -PKG_SECTION:= proxy +PKG_SECTION:= net/http PKG_BUILDDEP:= openssl pcre zlib PKG_DEPENDS:= libopenssl libpcre libpthread zlib PKG_URL:= http://nginx.org/ -- cgit v1.2.3