Remove CVS conflict markers.

diff --git a/lib/questionlib.php b/lib/questionlib.php
index b4b311ec861ce4756a73872fca57068fc868722e..0823db1f46a0d7b551d510ca23500b61ea8ab8bb 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -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

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 4ad31e46cd25b71e16b5109efff06a8418848688..c4c61f38d2f48391359b907574fbb426435e79e2 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2925,7 +2925,6 @@ body#mod-quiz-report table#attempts .picture {
 body#mod-quiz-report .controls {
   text-align: center;
 }
-/* <<<<<<< styles_layout.css */
 #mod-quiz-review #page .controls {
   text-align: center;
 }
@@ -2940,10 +2939,8 @@ body#mod-quiz-report .controls {
 .quizquestionlistcontrols {
   text-align: center;
 }
-/* ======= */
 body#question-preview .quemodname, body#question-preview .controls {
   text-align: center;
-/* >>>>>>> 1.333 */
 }
 
 /***