team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed needless diff stuff

Browse Source
This commit is contained in:
cktricky
2014-04-17 11:37:02 -04:00
parent 366edc3b09
commit 8cb6ff36ac
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/sessions/new.html.erb
-3
View File
@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<div align="right"> <div align="right">
<!-- support for multiple languages coming soon! --> <!-- support for multiple languages coming soon! -->
<script> <script>
@@ -16,7 +14,6 @@
//document.write("</select>"); //document.write("</select>");
</script> </script>
</div> </div>
>>>>>>> ab536af... removing select but keeping DOM XSS
<div class="row-fluid"> <div class="row-fluid">
<h2 align="center">MetaCorp</h2> <h2 align="center">MetaCorp</h2>
<h3 align="center">A GoatGroup Company</h3> <h3 align="center">A GoatGroup Company</h3>