Removed cvs conflict diff line

diff --git a/lib/filelib.php b/lib/filelib.php
index 1dbc5cbf4addc117432034b02b62c50d9f2f9bbf..cd341d33a50def32761ad251243ae67407bcd607 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1,4 +1,3 @@
-<<<<<<< filelib.php
 <?php //$Id$
 
 ///////////////////////////////////////////////////////////////////////////