From 576e185fe548be71d15f269f984aef8e343e2fb9 Mon Sep 17 00:00:00 2001 From: Sinestia <40812746+Sinestia@users.noreply.github.com> Date: Wed, 7 Jul 2021 05:36:11 -0500 Subject: [PATCH] Fix my TGUI mistakes & tweak uplink atomized edition --- tgui/packages/tgui-panel/Panel.js | 21 +++++++++++++++++++++ tgui/packages/tgui/interfaces/AirAlarm.js | 1 + tgui/packages/tgui/interfaces/Uplink.js | 8 +++++++- tgui/public/tgui-panel.bundle.js | 6 +++++- tgui/public/tgui.bundle.js | 6 +++++- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js index 8abe9eddf10..e46e527b6d6 100644 --- a/tgui/packages/tgui-panel/Panel.js +++ b/tgui/packages/tgui-panel/Panel.js @@ -52,9 +52,13 @@ export const Panel = (props, context) => { +======= + vertical> +>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716)) @@ -83,6 +87,7 @@ export const Panel = (props, context) => { )} +<<<<<<< HEAD {
+======= + + +
+ + +>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716)) +<<<<<<< HEAD +======= + + +>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))