From 8cb6ff36ac6d44070ed570a1530c69002e0761ea Mon Sep 17 00:00:00 2001
From: cktricky <ken.johnson@nvisiumsecurity.com>
Date: Thu, 17 Apr 2014 11:37:02 -0400
Subject: [PATCH] removed needless diff stuff

---
 app/views/sessions/new.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 2d1d450..eb80c99 100755
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 <div align="right">
   <!-- support for multiple languages coming soon! -->
   <script>
@@ -16,7 +14,6 @@
     //document.write("</select>");
   </script>
 </div>
->>>>>>> ab536af... removing select but keeping DOM XSS
 <div class="row-fluid">
   <h2 align="center">MetaCorp</h2>
   <h3 align="center">A GoatGroup Company</h3>