From 042551e5863fb3fe0494752ff20c4631da4dcccb Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sat, 19 Apr 2014 21:25:57 -0400
Subject: [PATCH] Borked NanoUI

---
 nano/js/nano_base_helpers.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js
index b41a8e0fb5c..437af2cd15b 100644
--- a/nano/js/nano_base_helpers.js
+++ b/nano/js/nano_base_helpers.js
@@ -207,15 +207,11 @@ NanoBaseHelpers = function ()
                     {
                         status = 'selected';
                     }
-<<<<<<< HEAD
-                    
-                    html += '<div class="link ' + status + ' dnaSubBlock" data-href="' + generateHref(parameters) + '" id="dnaBlock' + index + '">' + characters[index] + '</div>';
-                    
-=======
+
 
                     html += '<div class="link ' + status + ' dnaSubBlock" data-href="' + generateHref(parameters) + '" id="dnaBlock' + index + '">' + characters[index] + '</div>'
 
->>>>>>> 16f787a... Virology - NanoUI, gameplay tweaks, bugfixes
+
                     index++;
                     if (index % blockSize == 0 && index < characters.length)
                     {