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/netperf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/netperf/Makefile') diff --git a/package/netperf/Makefile b/package/netperf/Makefile index e72e85edd..2c137f358 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 391a0d98954c72a6ad7f08b8a115e1ce PKG_DESCR:= network performance measurement tools -PKG_SECTION:= net +PKG_SECTION:= net/perf PKG_URL:= http://www.netperf.org/netperf/ PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/ -- cgit v1.2.3