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/heirloom-cpio/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/heirloom-cpio') diff --git a/package/heirloom-cpio/Makefile b/package/heirloom-cpio/Makefile index a91b71ecf..124af9a70 100644 --- a/package/heirloom-cpio/Makefile +++ b/package/heirloom-cpio/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= heirloom-cpio PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= patched version of heirloom cpio -PKG_SECTION:= archive +PKG_SECTION:= app/archive PKG_CFLINE_HEIRLOOM_CPIO:= depends on ADK_HOST_ONLY -- cgit v1.2.3