diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/davfs2 | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/davfs2')
-rw-r--r-- | package/davfs2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |