removed needless diff stuff

2014-04-17 11:37:02 -04:00
parent 366edc3b09
commit 8cb6ff36ac
1 changed files with 0 additions and 3 deletions
@@ -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>