Conflicts:
application/helpers/expressions/em_manager_helper.php
application/modules/CheckQuestion.php
application/modules/CommentCheckQuestion.php
application/modules/CommentListQuestion.php
application/modules/DisplayQuestion.php
application/modules/ListQuestion.php
application/modules/NumberArrayQuestion.php
application/modules/NumericalQuestion.php
application/modules/QuestionModule.php
application/modules/RankingQuestion.php
application/modules/TextQuestion.php
Fix bug in NumericalQuestion.php and MultinumericalQuestion.php by merging my resolution branch. |