From 30353857f27399601ba94fdb9d387055d8fc3a59 Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Thu, 28 Apr 2022 14:57:45 +0200
Subject: [PATCH] undid accidental merge conflict changes
---
docker-compose/grafana/Dockerfile | 1 +
.../stationcontrol-jupyter/startup/01-devices.py | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker-compose/grafana/Dockerfile b/docker-compose/grafana/Dockerfile
index 2987c25fc..9f7ab94b1 100644
--- a/docker-compose/grafana/Dockerfile
+++ b/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
diff --git a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
index dd3c941b9..ba7ce483e 100644
--- a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+++ b/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]
-
--
GitLab