chore: resolved conflicts

lms/lms/doctype/lms_quiz/lms_quiz.py

@@ -279,6 +279,8 @@ def check_choice_answers(question, answers):
 	for num in range(1, 5):
 		if question_details[f"option_{num}"] in answers:
 			is_correct.append(question_details[f"is_correct_{num}"])
+		elif question_details[f"is_correct_{num}"]:
+			is_correct.append(2)
 		else:
 			is_correct.append(0)
 

lms/lms/widgets/NoPreviewModal.html

@@ -29,10 +29,6 @@
                 <button class="btn btn-primary btn-sm notify-me pull-right" data-course="{{course.name | urlencode}}">
                     {{ _("Notify me when available") }}
                 </button>
-                {% elif show_start_learing_cta(course, membership) %}
-                <button class="btn btn-primary btn-sm enroll-in-course pull-right" data-course="{{ course.name | urlencode}}">
-                    {{ _("Start Learning") }}
-                </button>
                 {% endif %}
             </div>
             {% endif %}