From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/chillispot/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package/chillispot') diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index fb430112c..aa5c08470 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -7,10 +7,9 @@ PKG_NAME:= chillispot PKG_VERSION:= 1.1.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b -PKG_DESCR:= Wireless LAN Access Point Controller +PKG_DESCR:= wireless LAN access point controller PKG_SECTION:= wifi PKG_BUILDDEP:= autotool -PKG_DEPENDS:= kmod-tun PKG_URL:= http://www.chillispot.info/ PKG_SITES= http://www.chillispot.info/download/ -- cgit v1.2.3