From 7218d08449253035dc54fa1d90f95cad3575ae7f Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@freifunk-ol.de>
Date: Tue, 2 May 2017 21:07:24 +0200
Subject: [PATCH] Revert "Merge branch 'master' into 'master'"

This reverts merge request !18
---
 modules | 8 ++------
 site.mk | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules b/modules
index d484a59..ecc3516 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,5 @@
-GLUON_SITE_FEEDS='ffnw netmon'
+GLUON_SITE_FEEDS='ffnw'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
-PACKAGES_FFNW_BRANCH=201705
+PACKAGES_FFNW_BRANCH=201704
 PACKAGES_FFNW_COMMIT=5704b555a20cfb62983682086716a90ac66bb8a4
-
-PACKAGES_NETMON_REPO=https://git.ffnw.de/netmon-sc/openwrt-feed.git
-PACKAGES_NETMON_BRANCH=master
-PACKAGES_NETMON_COMMIT=c91a52c5acb74bebc591bedb6738ec08b019b10a
\ No newline at end of file
diff --git a/site.mk b/site.mk
index cae3801..1777c8a 100644
--- a/site.mk
+++ b/site.mk
@@ -28,8 +28,7 @@ GLUON_SITE_PACKAGES := \
 	ffnw-config-mode-contact-info \
 	ffnw-hoodselector \
 	ffnw-multiple-v6-watchdoog \
-	ffnw-hoodselector-ctl \
-	netmon-node-client
+	ffnw-hoodselector-ctl
 
 USB_BASIC := \
 	kmod-usb-core \
-- 
GitLab