From 245877301213373a8da3868f8175eec5e3445f4d Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Thu, 7 May 2009 12:20:28 +0000
Subject: [PATCH] Removed cvs conflict diff line

---
 lib/filelib.php | 1 -
 1 file changed, 1 deletion(-)

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$
 
 ///////////////////////////////////////////////////////////////////////////
-- 
2.39.5