merge conflict fix

2016-07-16 14:40:14 +02:00 · 2016-07-16 14:40:14 +02:00 · 9891d43a19
parent 7dec2e21a7 6e2aed5738
commit 9891d43a19
1 changed files with 1 additions and 0 deletions
--- a/site.mk
+++ b/site.mk
@ -4,6 +4,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-respondd \
 	gluon-respondd-airtime \
 	gluon-respondd-clients \
+	gluon-respondd-lldp \
 	gluon-respondd-wifisettings \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-filter-multicast \