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/cifs-utils/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/cifs-utils/Makefile') diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 3befb43a3..c58a8ecd6 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 93697dbc043cb4d5c66e15e281f872e5 PKG_DESCR:= CIFS network filesystem utilities PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-cifs kmod-nls-utf8 PKG_BUILDDEP:= autotool PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils PKG_SITES:= ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/ -- cgit v1.2.3