From a3371abadaeab7389e4e7e2b8ecf32ac1a660cc5 Mon Sep 17 00:00:00 2001
From: Zekins <136648667+Zekins3366@users.noreply.github.com>
Date: Sat, 26 Oct 2024 00:29:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B8=D0=BD=D0=B8=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Neck/Misc/bellcollar.rsi/meta.json        | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
index f5472393efd..464e2e4a352 100644
--- a/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
@@ -1,15 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-<<<<<<< HEAD
-<<<<<<<< HEAD:Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
   "copyright": "Made by mnemotechnician (GitHub)",
-========
-  "copyright": "Taken from https://github.com/Civ13/Civ13",
->>>>>>>> private/UpOctober:Resources/Textures/Corvax/Objects/Specific/romanstandard.rsi/meta.json
-=======
-  "copyright": "Made by mnemotechnician (GitHub)",
->>>>>>> 25ade07db9ccfe590ce0b23a3a386852dd02a5fd
   "size": {
     "x": 32,
     "y": 32
@@ -19,10 +11,6 @@
       "name": "icon"
     },
     {
-<<<<<<< HEAD
-<<<<<<<< HEAD:Resources/Textures/Clothing/Neck/Misc/bellcollar.rsi/meta.json
-=======
->>>>>>> 25ade07db9ccfe590ce0b23a3a386852dd02a5fd
       "name": "equipped-NECK",
       "directions": 4
     },
@@ -31,15 +19,6 @@
       "directions": 4
     },
     {
-<<<<<<< HEAD
-========
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
->>>>>>>> private/UpOctober:Resources/Textures/Corvax/Objects/Specific/romanstandard.rsi/meta.json
-=======
->>>>>>> 25ade07db9ccfe590ce0b23a3a386852dd02a5fd
       "name": "inhand-right",
       "directions": 4
     }