From 7bfa966329f1f8f7aca1215de5f505f246af3f23 Mon Sep 17 00:00:00 2001
From: Username228 <semkin14jason@gmail.com>
Date: Sat, 25 May 2024 03:03:23 +0300
Subject: [PATCH] conflict fix

---
 Resources/Maps/ADTMaps/adt_avrite.yml | 6 +-----
 Resources/Maps/ADTMaps/adt_delta.yml  | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Resources/Maps/ADTMaps/adt_avrite.yml b/Resources/Maps/ADTMaps/adt_avrite.yml
index 6c9229cbb61..06a05581b2e 100644
--- 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
index f42831b24a8..09bfc456072 100644
--- 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