nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-29 18:26:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix busted merge.

Browse Source
This commit is contained in:
Andrew McMillan 2007-12-07 09:16:52 +13:00
parent aa76494204
commit 27be6f55f3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/website/inc/page-header.php
View File

@ -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>