merge conflict fix

This commit is contained in:
Simon Frerichs 2016-07-16 14:40:14 +02:00
commit 9891d43a19
1 changed files with 1 additions and 0 deletions

View File

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