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/dnsmasq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 88239aa10..fe1e51caa 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= dnsmasq PKG_VERSION:= 2.70 PKG_RELEASE:= 1 PKG_MD5SUM:= 1d654e80888ab5dbba015548fd284d46 -PKG_DESCR:= lightweight DNS and DHCP server -PKG_SECTION:= dns +PKG_DESCR:= lightweight dns, dhcp and tftp server +PKG_SECTION:= net/dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ PKG_SITES:= http://thekelleys.org.uk/dnsmasq/ -- cgit v1.2.3