fix problem caused by wrong merging

16 years ago · 1eefc822ab
parent d15464a0d8
commit 1eefc822ab
2 changed files with 3 additions and 6 deletions
--- 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        |
--- 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
+?>