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/wdfs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/wdfs') diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index f64573774..e8f39bce2 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 6 PKG_MD5SUM:= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs -PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib +PKG_DEPENDS:= libopenssl fuse-utils neon glib PKG_BUILDDEP:= openssl fuse neon glib PKG_SITES:= http://noedler.de/projekte/wdfs/ -- cgit v1.2.3