From 617acdcc172aae0f778894932ef8b8f86fae5436 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sat, 2 Aug 2014 20:37:13 -0400
Subject: [PATCH] Real fix

---
 nano/templates/escape_shuttle_control_console.tmpl | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/nano/templates/escape_shuttle_control_console.tmpl b/nano/templates/escape_shuttle_control_console.tmpl
index f199fdbb57a..8fdb6b4cc5b 100644
--- a/nano/templates/escape_shuttle_control_console.tmpl
+++ b/nano/templates/escape_shuttle_control_console.tmpl
@@ -63,17 +63,12 @@
 	</div>
 </div>
 <div class="item" style="padding-top: 10px">
-<<<<<<< HEAD
 	{{for data.auth_list}}
-		{{:helper.link(value.auth_name, 'eject', {'auth' : value.auth_hash}, null, 'itemContentWide')}}
-=======
-	{{for auth_list}}
-		{{if auth_hash}}
-			{{:~link(auth_name, 'eject', {'removeid' : auth_hash}, null, 'itemContentWide')}}
+		{{if value.auth_hash}}
+			{{:helper.link(value.auth_name, 'eject', {'removeid' : value.auth_hash}, null, 'itemContentWide')}}
 		{{else}}
-			{{:~link("", 'eject', {'scanid' : 1}, null, 'itemContentWide')}}
+			{{:helper.link("", 'eject', {'scanid' : 1}, null, 'itemContentWide')}}
 		{{/if}}
->>>>>>> 17574b8... Allows escape shuttle to scan IDs from within UI
 	{{/for}}
 </div>