Fixed merge chars: =======

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