From: nicolasconnault <nicolasconnault>
Date: Thu, 7 May 2009 12:20:28 +0000 (+0000)
Subject: Removed cvs conflict diff line
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=245877301213373a8da3868f8175eec5e3445f4d;p=moodle.git

Removed cvs conflict diff line
---

diff --git a/lib/filelib.php b/lib/filelib.php
index 1dbc5cbf4a..cd341d33a5 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1,4 +1,3 @@
-<<<<<<< filelib.php
 <?php //$Id$
 
 ///////////////////////////////////////////////////////////////////////////