remove error marker >_<

This commit is contained in:
Shish 2010-04-11 13:13:58 +01:00
parent 2a243b6a45
commit b9f21571eb

View file

@ -1,4 +1,3 @@
<<<<<<< HEAD:themes/danbooru/layout.class.php
<?php
/**
* Name: Danbooru Theme