diff options
| author | Robin <robin@Amaya.(none)> | 2010-04-28 21:51:54 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-04-28 21:51:54 +0200 |
| commit | 1eefc822ab7d0fc522ed7fa0c702cbd7a2f536e3 (patch) | |
| tree | fe5ef319b3db0f8a90dd121ae8d6e3e228020ca8 | |
| parent | d15464a0d8d9c2e526bd5df70994df66b191bb87 (diff) | |
| download | nextcloud-server-1eefc822ab7d0fc522ed7fa0c702cbd7a2f536e3.tar.gz nextcloud-server-1eefc822ab7d0fc522ed7fa0c702cbd7a2f536e3.zip | |
fix problem caused by wrong merging
| -rwxr-xr-x | inc/HTTP/WebDAV/Server.php | 3 | ||||
| -rwxr-xr-x | inc/HTTP/WebDAV/Server/Filesystem.php | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/inc/HTTP/WebDAV/Server.php b/inc/HTTP/WebDAV/Server.php index 913550eb150..ba57aaf48be 100755 --- a/inc/HTTP/WebDAV/Server.php +++ b/inc/HTTP/WebDAV/Server.php @@ -1,5 +1,4 @@ -<<<<<<< HEAD:inc/HTTP/WebDAV/Server.php -<?php // $Id$ +<?php /* +----------------------------------------------------------------------+ | Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe | diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php index d38d05e8f26..202909895c8 100755 --- a/inc/HTTP/WebDAV/Server/Filesystem.php +++ b/inc/HTTP/WebDAV/Server/Filesystem.php @@ -1,5 +1,4 @@ -<<<<<<< HEAD:inc/HTTP/WebDAV/Server/Filesystem.php -<?php // $Id$ +<?php /* +----------------------------------------------------------------------+ | Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe | @@ -1571,5 +1570,4 @@ } -?> ->>>>>>> 854e0c5a9c9060e827fbbfddffeeeadfc2d27278:inc/HTTP/WebDAV/Server/Filesystem.php +?>
\ No newline at end of file |