From a70f040d1bd6801d29002c917b86e7f4ae43b308 Mon Sep 17 00:00:00 2001
From: foboscheshir <156405958+foboscheshir@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:10:38 +0700
Subject: [PATCH] dsdsad

---
 .../Clothing/Mask/sadmime.rsi/meta.json       | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
index d8ec7f411fdbad..f7aa0c78b0e579 100644
--- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). Vox edit by foboscheshir (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -18,37 +17,12 @@
     {
       "name": "equipped-MASK-reptilian",
       "directions": 4
-    }
-    {"name":"equipped-mask-vox",
-      "directions": 4
-    }
-  ]
-}
-=======
-{
-  "version": 1,
-  "license": null,
-  "copyright": null,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "equipped-MASK",
-      "directions": 4
     },
     {
-      "name": "equipped-MASK-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-MASK-vox",
-      "directions": 4
-    },
-    {
-      "name": "icon"
+      "name":"equipped-MASK-vox",
+      "directions":4
     }
+  
+    
   ]
 }
->>>>>>> ef4a3986c3264cdd4fe5c83f9a9d59a1be7a1ef2