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/base-files/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/Makefile') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a34f504e9..6f09ab0b6 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 PKG_RELEASE:= 96 -PKG_SECTION:= base +PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts WRKDIST= ${WRKDIR}/base-files -- cgit v1.2.3