From 334a8a46c524019c936122d075bee526bd7a48ce Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Wed, 18 Dec 2024 18:58:26 -0600 Subject: [PATCH] goofed the confict resolve --- .../DeltaV/Structures/Wallmounts/intercom.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json index 3730fc84677..d44e3c25968 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrage, Modified by Radezolid for random intercom spawner", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrage, Modified by Radezolid for random intercom spawner", "states": [ { "name": "base",