undid accidental merge conflict changes

docker-compose/grafana/Dockerfile

@@ -4,6 +4,7 @@ FROM grafana/grafana
 RUN grafana-cli plugins install briangann-datatable-panel
 RUN grafana-cli plugins install ae3e-plotly-panel
 RUN grafana-cli plugins install yesoreyeram-infinity-datasource
+RUN grafana-cli plugins install aceiot-svg-panel
 RUN grafana-cli plugins install alexanderzobnin-zabbix-app
 RUN grafana-cli plugins install yesoreyeram-boomtable-panel
 

docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py

@@ -17,4 +17,3 @@ temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
 
 # Put them in a list in case one wants to iterate
 devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperaturemanager, docker]
-