merge conflict fix
This commit is contained in:
commit
9891d43a19
1
site.mk
1
site.mk
|
@ -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 \
|
||||||
|
|
Loading…
Reference in New Issue