conflict fix

AdventureTimeSS14 · May 25, 2024 · 7bfa966 · 7bfa966
1 parent 7b58e96
commit 7bfa966
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Resources/Maps/ADTMaps/adt_avrite.yml b/Resources/Maps/ADTMaps/adt_avrite.yml
@@ -184889,8 +184889,6 @@ entities:
       pos: -13.5,-16.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 252
     - type: AtmosDevice
@@ -187634,8 +187632,6 @@ entities:
       pos: -11.5,-16.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 252
     - type: AtmosDevice
@@ -208338,7 +208334,7 @@ entities:
       - stampedColor: '#C69B17FF'
         stampedName: stamp-component-stamped-name-ce
       content: >-
-        Я УНИЧТОЖИЛ 10!.. 
+        Я УНИЧТОЖИЛ 10!..
 
 
         НЕТ!!

diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml
@@ -112616,8 +112616,6 @@ entities:
       pos: -8.5,44.5
       parent: 13307
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 8929
   - uid: 1975