fixed merge conflicts

2021-04-26 15:01:22 +02:00
parent bc77e6ae76 fa58c8e2c3
commit e23bc11608
6 changed files with 87 additions and 1 deletions
--- a/config/definitions.py
+++ b/config/definitions.py
@ -16,3 +16,4 @@ class CustomServiceList(enum.Enum):
    TMP1075_2 = "tmp1075_2"
    HEATER = "heater"
    IMTQ = "imtq"
+    PLOC = "ploc"