fixed conflicts

2021-08-08 15:20:28 +02:00
parent e7d8199e67 a226bf659e
commit 547b4b2137
45 changed files with 381 additions and 103 deletions
--- a/config/definitions.py
+++ b/config/definitions.py
@ -30,3 +30,4 @@ class CustomServiceList(enum.Enum):
    RAD_SENSOR = "rad_sensor"
    PLOC_SUPV = "ploc_supv"
    PLOC_UPDATER = "ploc_updater"
+    CORE = 'core'