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/ipvsadm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ipvsadm') diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index ac7fda27a..918a3a493 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8 PKG_DESCR:= IPVS admin utility PKG_SECTION:= net -PKG_DEPENDS:= libpopt kmod-ip-vs +PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt PKG_URL:= http://www.linuxvirtualserver.org/ PKG_SITES:= http://www.linuxvirtualserver.org/software/kernel-2.6/ -- cgit v1.2.3