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/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 e24333e15..7555a0134 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs -PKG_DEPENDS:= fuse-utils kmod-fuse-fs neon +PKG_DEPENDS:= fuse-utils neon PKG_BUILDDEP:= libiconv-tiny neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/ -- cgit v1.2.3