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/cpio/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cpio') diff --git a/package/cpio/Makefile b/package/cpio/Makefile index cbe8cc380..abf89017e 100644 --- a/package/cpio/Makefile +++ b/package/cpio/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.11 PKG_RELEASE:= 1 PKG_MD5SUM:= 1112bb6c45863468b5496ba128792f6c PKG_DESCR:= archive utility -PKG_SECTION:= archive +PKG_SECTION:= app/archive PKG_URL:= http://www.gnu.org/software/cpio/ PKG_SITES:= ${MASTER_SITE_GNU:=cpio/} PKG_BB:= 1 -- cgit v1.2.3