fixed merge conflicts

2021-06-11 13:51:56 +02:00
parent 06750809cb 7a4d6ee13a
commit 58c20e31cc
33 changed files with 183 additions and 194 deletions
--- a/config/definitions.py
+++ b/config/definitions.py
@ -8,6 +8,7 @@ import enum


 class CustomServiceList(enum.Enum):
+    TEST_DEVICE = "test",
    P60DOCK = "p60dock"
    PDU1 = "pdu1"
    PDU2 = "pdu2"
@ -17,3 +18,5 @@ class CustomServiceList(enum.Enum):
    HEATER = "heater"
    IMTQ = "imtq"
    PLOC = "ploc"
+    PCDU = "pcdu",
+    SA_DEPLYOMENT = "sa_depl"