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/tptest/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/tptest') diff --git a/package/tptest/Makefile b/package/tptest/Makefile index aa9d1a153..ee4d2e387 100644 --- a/package/tptest/Makefile +++ b/package/tptest/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77 PKG_DESCR:= internet bandwidth tester -PKG_SECTION:= net +PKG_SECTION:= net/perf PKG_URL:= http://tptest.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/} -- cgit v1.2.3