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/adk-test-tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/adk-test-tools') diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile index efc8713ec..211fd25ff 100644 --- a/package/adk-test-tools/Makefile +++ b/package/adk-test-tools/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= adk-test-tools PKG_VERSION:= 0.1 PKG_RELEASE:= 7 PKG_DESCR:= helper tools and scripts for adk-test-framework -PKG_SECTION:= misc +PKG_SECTION:= base/misc PKG_URL:= http://openadk.org/ NO_DISTFILES:= 1 -- cgit v1.2.3