AAAAAA. Git my beloathed

impstation · Jan 7, 2025 · 0ee278b · 0ee278b
1 parent 1dfe010
commit 0ee278b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -1,11 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-<<<<<<< HEAD
-  "copyright": "Frezon canister modified from tgstation, some assets taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. New Canisters by AftrLite(Github) inspired by the CEV-Eris sprites. Other assets taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/2fd9200036dd18a56e6887f8090d5dc0477fc6f3.",
-=======
-  "copyright": "Frezon canister modified from tgstation, some assets taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. New Canisters by AftrLite(Github) based on the CEV-Eris sprites. Other assets taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/2fd9200036dd18a56e6887f8090d5dc0477fc6f3.",
->>>>>>> 5afe775e914668adfccee0408794d4388095df2c
+  "copyright": "Frezon canister modified from tgstation, some assets taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. New Canisters by AftrLite(Github), inspired by CEV-Eris sprites at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af. Other assets taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/2fd9200036dd18a56e6887f8090d5dc0477fc6f3.",
   "size": {
     "x": 32,
     "y": 32