Permalink
Browse files

Removed meld tags; doh!

  • Loading branch information...
1 parent 1598060 commit 6d6e8d371329cfefbcd056fd712f8d14b263f368 @ajbkr committed Feb 21, 2012
Showing with 0 additions and 2 deletions.
  1. +0 −2 public_html/index.php
View
@@ -74,7 +74,6 @@
</p>
</div>
</section>
-<<<<<<< HEAD
<section class="main">
<div class="links content cf">
<h1>bbgchallenge3 Has Begun!</h1>
@@ -97,7 +96,6 @@
</div>
</section>
<section class="main">
-=======

0 comments on commit 6d6e8d3

Please sign in to comment.