Минификс

Corvax-Frontier · Oct 25, 2024 · a3371ab · a3371ab
1 parent 530f363
commit a3371ab
Showing 1 changed file with 0 additions and 21 deletions.
diff --git 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
     }