remove error marker >_<
This commit is contained in:
parent
2a243b6a45
commit
b9f21571eb
@ -1,4 +1,3 @@
|
|||||||
<<<<<<< HEAD:themes/danbooru/layout.class.php
|
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Name: Danbooru Theme
|
* Name: Danbooru Theme
|
||||||
|
Loading…
x
Reference in New Issue
Block a user