From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/iw/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/iw')

diff --git a/package/iw/Makefile b/package/iw/Makefile
index fc20c2f52..f90877048 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		iw
 PKG_VERSION:=		3.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		17704d7c41bcb85cb32cb33b07a1c4cc
-PKG_DESCR:=		tools for setting up WiFi cards via netlink (nl80211)
-PKG_SECTION:=		wifi
+PKG_DESCR:=		tools for setting up wiFi cards via netlink
+PKG_SECTION:=		net/wifi
 PKG_DEPENDS:=		libnl
 PKG_BUILDDEP:=		libnl
 PKG_URL:=		http://wireless.kernel.org/en/users/Documentation/iw
-- 
cgit v1.2.3