mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix problem caused by wrong merging

This commit is contained in:
Robin 2010-04-28 21:51:54 +02:00
parent d15464a0d8
commit 1eefc822ab
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/HTTP/WebDAV/Server.php
View File

@ -1,5 +1,4 @@
<<<<<<< HEAD:inc/HTTP/WebDAV/Server.php <?php
<?php // $Id$
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe | | Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe |

4
inc/HTTP/WebDAV/Server/Filesystem.php
View File

@ -1,5 +1,4 @@
<<<<<<< HEAD:inc/HTTP/WebDAV/Server/Filesystem.php <?php
<?php // $Id$
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe | | Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe |
@ -1572,4 +1571,3 @@
?> ?>
>>>>>>> 854e0c5a9c9060e827fbbfddffeeeadfc2d27278:inc/HTTP/WebDAV/Server/Filesystem.php