фиксим ямл?

AdventureTimeSS14 · Jul 26, 2024 · e514726 · e514726
1 parent df41060
commit e514726
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/Resources/Prototypes/ADT/StartingGear/ERT/ERT_leader.yml b/Resources/Prototypes/ADT/StartingGear/ERT/ERT_leader.yml
@@ -30,16 +30,8 @@
     suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
     underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
-<<<<<<< HEAD
   underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
   innerClothingSkirt: ClothingUniformJumpsuitColorBrown
   satchel: ClothingBackpackDuffelCBURN
   duffelbag: ClothingBackpackDuffelCBURN
-=======
-    underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear
-    underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear
-    innerClothingSkirt: ClothingUniformJumpsuitColorBrown
-    satchel: ClothingBackpackDuffelCBURN
-    duffelbag: ClothingBackpackDuffelCBURN
->>>>>>> 30cd30aca5 (немного переместил лодаут)