Update meta.json

SS14-Classic · Jul 22, 2024 · fff7343 · fff7343
1 parent ee847e6
commit fff7343
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
@@ -1,17 +1,4 @@
 {
-<<<<<<< HEAD
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-=======
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. lamia & segment by @noctyrnal, harpy by VMSolidus",
@@ -23,7 +10,6 @@
     {
       "name": "icon"
     },
->>>>>>> EE-Master/LamiaSystem
     {
       "name": "equipped-OUTERCLOTHING",
       "directions": 4