From 1eefc822ab7d0fc522ed7fa0c702cbd7a2f536e3 Mon Sep 17 00:00:00 2001
From: Robin <robin@Amaya.(none)>
Date: Wed, 28 Apr 2010 21:51:54 +0200
Subject: [PATCH] fix problem caused by wrong merging
---
inc/HTTP/WebDAV/Server.php | 3 +--
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 913550eb15..ba57aaf48b 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 d38d05e8f2..202909895c 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
--
GitLab