mirror of
https://github.com/agessaman/MeshCore.git
synced 2026-07-17 07:21:49 +00:00
Resolved conflicts in: - examples/simple_repeater/MyMesh.cpp: kept analyzer/MQTT origin code, updated acl.load() signature - examples/simple_room_server/MyMesh.cpp: kept MQTT bridge init, added acl parameter to _cli constructor - src/helpers/CommonCLI.cpp: merged MQTT get commands with ADC/power management commands