goofed the confict resolve

DeltaV-Station · Dec 19, 2024 · 334a8a4 · 334a8a4
1 parent 90c7e7d
commit 334a8a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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",