Фиксы

Corvax-Frontier · Apr 23, 2024 · 5c41dce · 5c41dce
1 parent a78a2d4
commit 5c41dce
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
@@ -57,5 +56,5 @@
       "name": "inhand-right-light",
       "directions": 4
     }
-  ]
-}
+  ]
+}