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/squashfs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/squashfs') diff --git a/package/squashfs/Makefile b/package/squashfs/Makefile index 8478f6c57..66dcf3ddc 100644 --- a/package/squashfs/Makefile +++ b/package/squashfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852 PKG_DESCR:= squashfs filesystem utilities HOST_BUILDDEP:= xz-host -PKG_SECTION:= fs +PKG_SECTION:= sys/fs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/} DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz -- cgit v1.2.3