Remove CVS conflict markers.

This commit is contained in:
tjhunt 2007-02-28 15:16:12 +00:00
parent 95e5c19295
commit e3455f160a

View file

@ -2926,7 +2926,6 @@ body#mod-quiz-report table#attempts .picture {
body#mod-quiz-report .controls { body#mod-quiz-report .controls {
text-align: center; text-align: center;
} }
/* <<<<<<< styles_layout.css */
#mod-quiz-review #page .controls { #mod-quiz-review #page .controls {
text-align: center; text-align: center;
} }
@ -2941,10 +2940,8 @@ body#mod-quiz-report .controls {
.quizquestionlistcontrols { .quizquestionlistcontrols {
text-align: center; text-align: center;
} }
/* ======= */
body#question-preview .quemodname, body#question-preview .controls { body#question-preview .quemodname, body#question-preview .controls {
text-align: center; text-align: center;
/* >>>>>>> 1.333 */
} }
/*** /***