fec26c1186fef7d7bb0bf0114dd6ad71d2478503
# Conflicts: # src/aare/daq/devices.py # src/aare/daq/server.py # src/aare/devices/aerotech.py # src/aare/devices/tell_client.py # src/aare/gui/gui.py # src/aare/gui/threads/daq_worker.py # src/aare/gui/widgets/alert_banner.py