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