quick fix

2016-07-11 20:19:13 +02:00 · 2016-07-11 20:19:13 +02:00 · a0ef869300
parent b6880d4e06
commit a0ef869300
2 changed files with 1 additions and 5 deletions
--- a/4
+++ b/4
@ -2,8 +2,4 @@ GLUON_SITE_FEEDS='ffhb'

 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_BRANCH=breminale2016
-<<<<<<< HEAD
 PACKAGES_FFHB_COMMIT=b415c1d264810522aad3b78b41fc1041f0fb15b5
-=======
-PACKAGES_FFHB_COMMIT=6a9ca2a293dbd75eed3c661d2db9e04e6c68d3f3
->>>>>>> 5c9690c4b7bbe75ba0b6331d3ddeb3ce053be002
--- a/site.mk
+++ b/site.mk
@ -3,7 +3,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-client-bridge \
 	gluon-respondd \
 	gluon-respondd-airtime \
-	gluon-respondd-lldp \
+	gluon-respondd-clients \
 	gluon-respondd-wifisettings \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-filter-multicast \