diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js index 8abe9eddf1..e46e527b6d 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))