remove error marker >_<

2010-04-11 13:13:58 +01:00 · 2010-04-11 13:13:58 +01:00 · b9f21571eb
commit b9f21571eb
parent 2a243b6a45
1 changed files with 0 additions and 1 deletions
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@ -1,4 +1,3 @@
-<<<<<<< HEAD:themes/danbooru/layout.class.php
 <?php
 /**
 * Name: Danbooru Theme