Remove CVS confilt markers.

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