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/davfs2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/davfs2') diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 7555a0134..0bfbc4189 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= davfs2 PKG_VERSION:= 1.4.7 PKG_RELEASE:= 1 PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186 -PKG_DESCR:= WebDAV filesystem +PKG_DESCR:= webdav filesystem PKG_SECTION:= net/fs PKG_DEPENDS:= fuse-utils neon PKG_BUILDDEP:= libiconv-tiny neon fuse -- cgit v1.2.3