1 files changed, 2 insertions, 4 deletions
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