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/ipvsadm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/ipvsadm') diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index 918a3a493..6c04ab54b 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ipvsadm PKG_VERSION:= 1.26 PKG_RELEASE:= 2 PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8 -PKG_DESCR:= IPVS admin utility -PKG_SECTION:= net +PKG_DESCR:= ip virtual server admin utility +PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt PKG_URL:= http://www.linuxvirtualserver.org/ -- cgit v1.2.3