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/wifidog/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/wifidog/Makefile') diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index 8b82dfcf2..bdfde47c4 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= wifidog PKG_VERSION:= 1.1.5 PKG_RELEASE:= 2 PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31 -PKG_DESCR:= a complete and embeddable captive portal -PKG_SECTION:= wifi +PKG_DESCR:= complete and embeddable captive portal +PKG_SECTION:= net/wifi PKG_DEPENDS:= iptables PKG_URL:= http://dev.wifidog.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} -- cgit v1.2.3