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/busybox/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/busybox/Makefile') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 9cc97146e..36ed09f06 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.22.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 337d1a15ab1cb1d4ed423168b1eb7d7e PKG_DESCR:= core utilities for embedded systems -PKG_SECTION:= core +PKG_SECTION:= base/apps PKG_BUILDDEP:= bzip2-host PKG_URL:= http://www.busybox.net/ PKG_SITES:= http://www.busybox.net/downloads/ -- cgit v1.2.3