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/stress/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/stress') diff --git a/package/stress/Makefile b/package/stress/Makefile index 8bbd341f7..3218d3b9d 100644 --- a/package/stress/Makefile +++ b/package/stress/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 PKG_MD5SUM:= d693ff044ac7d34f8aaea202cd96f679 PKG_DESCR:= simple tool that imposes certain types of compute stress -PKG_SECTION:= utils +PKG_SECTION:= sys/utils PKG_SITES:= http://weather.ou.edu/~apw/projects/stress/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -- cgit v1.2.3