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/net-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/net-tools/Makefile') diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile index c95c43c1a..6b8cceb22 100644 --- a/package/net-tools/Makefile +++ b/package/net-tools/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= net-tools PKG_VERSION:= 1.60 PKG_RELEASE:= 2 PKG_MD5SUM:= 888774accab40217dde927e21979c165 -PKG_DESCR:= Linux net-tools -PKG_SECTION:= net +PKG_DESCR:= arp networking tool +PKG_SECTION:= net/misc PKG_URL:= http://net-tools.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-tools/} PKG_NOPARALLEL:= 1 -- cgit v1.2.3