L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove CVS confilt markers.

Browse Source
This commit is contained in:
tjhunt
2007-02-28 15:11:54 +00:00
parent a78af87881
commit 95e5c19295
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/questionlib.php
-4
View File
@@ -10,11 +10,7 @@
* TODO: separate those functions which form part of the API * TODO: separate those functions which form part of the API
* from the helper functions. * from the helper functions.
* *
<<<<<<< questionlib.php
* @version $Id$ * @version $Id$
=======
* @version $Id$
>>>>>>> 1.72.2.6
* @author Martin Dougiamas and many others. This has recently been completely * @author Martin Dougiamas and many others. This has recently been completely
* rewritten by Alex Smith, Julian Sedding and Gustav Delius as part of * rewritten by Alex Smith, Julian Sedding and Gustav Delius as part of
* the Serving Mathematics project * the Serving Mathematics project