From: ethem <ethem>
Date: Wed, 18 Oct 2006 12:45:28 +0000 (+0000)
Subject: Fixed merge chars: =======
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=821267bccf416bb48da65b72f0db6a569280c2d0;p=moodle.git

Fixed merge chars: =======
---

diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index 2b17546e59..1dcdeef978 100644
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -1,5 +1,4 @@
 <?php // $Id$
-=======
 
 /// Load libraries
     require_once('../../config.php');