Take out some characters doing strange things under 1.5

(perhaps result of a conficting cvs merge ????)
2005-03-24 20:07:54 +00:00
parent da4c3aed49
commit b5ddd37f8a
1 changed files with 0 additions and 1 deletions
@@ -1,4 +1,3 @@
-<<<<<<< moodle.php
 <?php // $Id$ 
      // moodle.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005031000)