Merge branch 'attribution-fix' of https://github.com/AftrLite/imp-sta…

…tion-14 into attribution-fix # Conflicts: # Resources/Textures/Structures/Storage/canister.rsi/meta.json
impstation · Jan 7, 2025 · 1dfe010 · 1dfe010
2 parents 1c1dc28 + 5afe775
commit 1dfe010
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -1,7 +1,11 @@
 {
   "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
   "size": {
     "x": 32,
     "y": 32