From b9f21571eb0d6d3ed12be84751ad27ae76bdaeb7 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 11 Apr 2010 13:13:58 +0100
Subject: [PATCH] remove error marker >_<

---
 themes/danbooru/layout.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 45bcd96f..519f80a5 100644
--- 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