mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Curse you CVS!!! Didn't notice strange merge error.
This commit is contained in:
parent
549c2dd2f6
commit
8de7c5e4bc
@ -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
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user