From 71e0ee6eaf697e7e41ede323dc376d3d9f3ec5ee Mon Sep 17 00:00:00 2001 From: Jawayria Date: Tue, 2 Feb 2021 19:52:11 +0500 Subject: [PATCH] Resolved errors --- lms/djangoapps/certificates/signals.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py index 98c249c451..d6ed8dea86 100644 --- a/lms/djangoapps/certificates/signals.py +++ b/lms/djangoapps/certificates/signals.py @@ -68,14 +68,7 @@ def listen_for_passing_grade(sender, user, course_id, **kwargs): # pylint: disa Listen for a learner passing a course, send cert generation task, downstream signal from COURSE_GRADE_CHANGED """ -<<<<<<< HEAD -<<<<<<< HEAD -======= course = CourseOverview.get_from_id(course_id) # lint-amnesty, pylint: disable=unused-variable ->>>>>>> Applied pylint-amnesty to certificates -======= - course = CourseOverview.get_from_id(course_id) # lint-amnesty, pylint: disable=unused-variable ->>>>>>> Applied pylint-amnesty to certificates if not auto_certificate_generation_enabled(): return