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/cherokee/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cherokee') diff --git a/package/cherokee/Makefile b/package/cherokee/Makefile index a63f4ac9f..194e733ee 100644 --- a/package/cherokee/Makefile +++ b/package/cherokee/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.101 PKG_RELEASE:= 1 PKG_MD5SUM:= ef47003355a2e368e4d9596cd070ef23 PKG_DESCR:= small and fast webserver -PKG_SECTION:= www +PKG_SECTION:= net/http PKG_URL:= http://www.cherokee-project.com PKG_SITES:= http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/ -- cgit v1.2.3