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/syslinux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/syslinux') diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile index aca09091a..c0d4391cb 100644 --- a/package/syslinux/Makefile +++ b/package/syslinux/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 6.02 PKG_RELEASE:= 1 PKG_MD5SUM:= 6f275813a1b08cf852e55c0a3f8fbc78 PKG_DESCR:= lightweight bootloaders -PKG_SECTION:= boot +PKG_SECTION:= base/boot HOST_BUILDDEP:= nasm-host PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ -- cgit v1.2.3