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/olsrd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/olsrd') diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index e65b75ed9..55b63bc8a 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.6.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 65181a5280391d69411908c186fd0c1f PKG_DESCR:= optimized link state routing protocol -PKG_SECTION:= wifi +PKG_SECTION:= net/wifi PKG_URL:= http://www.olsr.org/ PKG_SITES:= http://www.olsr.org/releases/0.6/ PKG_NOPARALLEL:= 1 -- cgit v1.2.3