From d5b22e87c2fd711ce501694b972676ff1f8e7957 Mon Sep 17 00:00:00 2001
From: Finket <va.ketola@gmail.com>
Date: Wed, 21 Feb 2024 15:34:08 +0200
Subject: [PATCH] Fix missing merge

---
 .../Mobs/Customization/tails32x32.rsi/meta.json    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Resources/Textures/SimpleStation14/Mobs/Customization/tails32x32.rsi/meta.json b/Resources/Textures/SimpleStation14/Mobs/Customization/tails32x32.rsi/meta.json
index 49ca216dbc..54066dec47 100644
--- a/Resources/Textures/SimpleStation14/Mobs/Customization/tails32x32.rsi/meta.json
+++ b/Resources/Textures/SimpleStation14/Mobs/Customization/tails32x32.rsi/meta.json
@@ -88,8 +88,6 @@
             "directions": 4
         },
         {
-<<<<<<< HEAD
-=======
             "name": "shadowkin_shorter",
             "directions": 4
         },
@@ -98,7 +96,6 @@
             "directions": 4
         },
         {
->>>>>>> master
             "name": "shark_fin",
             "directions": 4
         },
@@ -113,21 +110,10 @@
         {
             "name": "succubus",
             "directions": 4
-<<<<<<< HEAD
         },
         {
             "name": "tentacle",
             "directions": 4
-        },
-        {
-            "name": "shadowkin_shorter",
-            "directions": 4
-        },
-        {
-            "name": "shadowkin_medium",
-            "directions": 4
-=======
->>>>>>> master
         }
     ]
 }