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/gatling/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/gatling') diff --git a/package/gatling/Makefile b/package/gatling/Makefile index e37daa8ac..c0cd0acd9 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.11 PKG_RELEASE:= 1 PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3 PKG_DESCR:= small non-forking webserver -PKG_SECTION:= www +PKG_SECTION:= net/http PKG_BUILDDEP:= libowfat libiconv-tiny PKG_URL:= http://www.fefe.de/gatling/ PKG_SITES:= http://dl.fefe.de/ -- cgit v1.2.3