fix conflict

2026-05-03 09:58:17 +02:00 · 2023-02-22 10:20:14 -05:00
parent c3784fe548 3a2ec8e8bf
commit 76011c96d6
104 changed files with 2331 additions and 1784 deletions
@@ -293,9 +293,9 @@ base:
    - sensoroni
    - manager
    - nginx
-    - soc
-    - influxdb
    - telegraf
+    - influxdb
+    - soc
    - kratos
    - firewall
    - idstools