Fix missing merge

Simple-Station · Feb 21, 2024 · d5b22e8 · d5b22e8
1 parent 3bf3545
commit d5b22e8
Showing 1 changed file with 0 additions and 14 deletions.
diff --git 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
         }
     ]
 }