From 27be6f55f361ecc28163da2c92dc188f71b1b194 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Fri, 7 Dec 2007 09:16:52 +1300
Subject: [PATCH] Fix busted merge.

---
 docs/website/inc/page-header.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/website/inc/page-header.php b/docs/website/inc/page-header.php
index 6fa74c3b..0bb3ef61 100644
--- a/docs/website/inc/page-header.php
+++ b/docs/website/inc/page-header.php
@@ -17,11 +17,7 @@ if ( isset($title) ) {
   echo $title;
 }
 else {
-<<<<<<< HEAD:docs/website/inc/page-header.php
   echo "DAViCal CalDAV Server";
-=======
-  echo "DAViCal";
->>>>>>> Rename to DAViCal in the documentation.:docs/website/inc/page-header.php
 }
 ?></div>
 <div id="subTitle">A CalDAV Store</div>