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/chillispot/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/chillispot') diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index aa5c08470..27b895a19 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= chillispot PKG_VERSION:= 1.1.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b -PKG_DESCR:= wireless LAN access point controller -PKG_SECTION:= wifi +PKG_DESCR:= wireless lan access point controller +PKG_SECTION:= net/wifi PKG_BUILDDEP:= autotool PKG_URL:= http://www.chillispot.info/ PKG_SITES= http://www.chillispot.info/download/ -- cgit v1.2.3