fix xd

fospas · Dec 23, 2024 · 49f7bc5 · 49f7bc5
1 parent 0fd4192
commit 49f7bc5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -150,7 +150,6 @@
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasFlowRegulator
 
->>>>>>> f9aa07ed8c90784df3ed3ea7ac216f8544752882
 - type: entity
   parent: GasBinaryBase
   id: GasPassiveGate
@@ -189,7 +188,6 @@
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasValve
 
->>>>>>> f9aa07ed8c90784df3ed3ea7ac216f8544752882
 - type: entity
   parent: GasBinaryBase
   id: GasValve

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -167,7 +167,6 @@
     - type: AtmosMonitoringConsoleDevice
       navMapBlip: GasVentScrubber
 
->>>>>>> f9aa07ed8c90784df3ed3ea7ac216f8544752882
 - type: entity
   parent: GasUnaryBase
   id: GasOutletInjector