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/dhcp-forwarder/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dhcp-forwarder/Makefile') diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index acecd9c56..e50e8edb7 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= dhcp-forwarder PKG_VERSION:= 0.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 3b96dd27f6d05502d4048acab453808d -PKG_DESCR:= DHCP relay agent -PKG_SECTION:= dhcp +PKG_DESCR:= dhcp relay agent +PKG_SECTION:= net/dns PKG_URL:= http://www.nongnu.org/dhcp-fwd/ PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ -- cgit v1.2.3