remove error marker >_<
This commit is contained in:
parent
2a243b6a45
commit
b9f21571eb
1 changed files with 0 additions and 1 deletions
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD:themes/danbooru/layout.class.php
|
||||
<?php
|
||||
/**
|
||||
* Name: Danbooru Theme
|
||||
|
|
Reference in a new issue