ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

quick fix

This commit is contained in:
Simon Frerichs 2016-07-11 20:19:13 +02:00
parent b6880d4e06
commit a0ef869300
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules
View File

@ -2,8 +2,4 @@ GLUON_SITE_FEEDS='ffhb'
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_BRANCH=breminale2016 PACKAGES_FFHB_BRANCH=breminale2016
<<<<<<< HEAD
PACKAGES_FFHB_COMMIT=b415c1d264810522aad3b78b41fc1041f0fb15b5 PACKAGES_FFHB_COMMIT=b415c1d264810522aad3b78b41fc1041f0fb15b5
=======
PACKAGES_FFHB_COMMIT=6a9ca2a293dbd75eed3c661d2db9e04e6c68d3f3
>>>>>>> 5c9690c4b7bbe75ba0b6331d3ddeb3ce053be002

2
site.mk
View File

@ -3,7 +3,7 @@ GLUON_SITE_PACKAGES := \
gluon-client-bridge \ gluon-client-bridge \
gluon-respondd \ gluon-respondd \
gluon-respondd-airtime \ gluon-respondd-airtime \
gluon-respondd-lldp \ gluon-respondd-clients \
gluon-respondd-wifisettings \ gluon-respondd-wifisettings \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \