From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/fuse/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/fuse') diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 8d55c6900..15f7ee2fc 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 33cae22ca50311446400daf8a6255c6a PKG_DESCR:= filesystem in userspace utility PKG_SECTION:= fs -PKG_DEPENDS:= kmod-fuse-fs libfuse +PKG_DEPENDS:= libfuse PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://fuse.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} -- cgit v1.2.3