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/arpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/arpd/Makefile') diff --git a/package/arpd/Makefile b/package/arpd/Makefile index bdc603d8d..bb0901382 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= arpd PKG_VERSION:= 0.2 PKG_RELEASE:= 3 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d -PKG_DESCR:= generates ARP responses for IP address ranges -PKG_SECTION:= route +PKG_DESCR:= generates arp responses for ip address ranges +PKG_SECTION:= net/route PKG_DEPENDS:= libpcap libdnet libevent PKG_BUILDDEP:= libpcap libdnet libevent PKG_URL:= http://niels.xtdnet.nl/honeyd/ -- cgit v1.2.3