From 4261fa0ae4cfce48277e2e2d44c16fa9df8edfc7 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 20 Jan 2014 04:11:31 -0500 Subject: [PATCH] Missed a spot --- code/modules/nano/nanoui.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 7fea6105dfb..81a401fb773 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -288,7 +288,7 @@ nanoui is used to open and update nano browser uis [head_content] - +
[title ? "
[title]
" : ""]
-<<<<<<< HEAD -
Initiating...
-======= ->>>>>>> b393ea6... NanoUI changes from Faerdan "} /**