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/mkimage/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/mkimage') diff --git a/package/mkimage/Makefile b/package/mkimage/Makefile index 3d6fbc45d..3c3dd30f7 100644 --- a/package/mkimage/Makefile +++ b/package/mkimage/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852 PKG_DESCR:= stripped down mkimage utility -PKG_SECTION:= misc +PKG_SECTION:= sys/misc NO_DISTFILES:= 1 -- cgit v1.2.3