Curse you CVS!!! Didn't notice strange merge error.

This commit is contained in:
thepurpleblob 2008-08-27 10:27:39 +00:00
parent 549c2dd2f6
commit 8de7c5e4bc

View File

@ -34,11 +34,7 @@
* - datalib.php - functions that access the database.
* - moodlelib.php - general-purpose Moodle functions.
* @author Martin Dougiamas
<<<<<<< weblib.php
* @version $Id$
=======
* @version $Id$
>>>>>>> 1.970.2.107
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package moodlecore
*/