From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/fuse/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/fuse')

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 15f7ee2fc..befbacc97 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		2.9.3
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		33cae22ca50311446400daf8a6255c6a
 PKG_DESCR:=		filesystem in userspace utility
-PKG_SECTION:=		fs
+PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libfuse
 PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://fuse.sourceforge.net/
@@ -20,7 +20,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE
 PKGSD_LIBFUSE:=		filesystem in userspace library
-PKGSC_LIBFUSE:=		libs
+PKGSC_LIBFUSE:=		libs/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
-- 
cgit v1.2.3