From 633b9f7060472614f4095027d544965d1b89b9a3 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Wed, 3 Feb 2021 15:47:18 +0500 Subject: [PATCH] resolved errors --- common/djangoapps/student/management/commands/add_to_group.py | 4 ---- common/djangoapps/student/tasks.py | 3 --- 2 files changed, 7 deletions(-) diff --git a/common/djangoapps/student/management/commands/add_to_group.py b/common/djangoapps/student/management/commands/add_to_group.py index 163e89c671..7381a22993 100644 --- a/common/djangoapps/student/management/commands/add_to_group.py +++ b/common/djangoapps/student/management/commands/add_to_group.py @@ -1,8 +1,4 @@ -<<<<<<< HEAD # lint-amnesty, pylint: disable=missing-module-docstring -======= - # lint-amnesty, pylint: disable=missing-module-docstring ->>>>>>> Applied pylint-amnesty to student from django.contrib.auth.models import Group, User # lint-amnesty, pylint: disable=imported-auth-user from django.core.management.base import BaseCommand, CommandError diff --git a/common/djangoapps/student/tasks.py b/common/djangoapps/student/tasks.py index 6653508586..e580a181a6 100644 --- a/common/djangoapps/student/tasks.py +++ b/common/djangoapps/student/tasks.py @@ -71,7 +71,6 @@ def _send_activation_email(self, msg_string, from_address=None): dest_addr, ) raise Exception # lint-amnesty, pylint: disable=raise-missing-from -<<<<<<< HEAD _OLD_TASK_NAME = 'student.send_activation_email' @@ -84,5 +83,3 @@ _NEW_TASK_NAME = 'common.djangoapps.student.tasks.send_activation_email' # set `send_activation_email` to the new-named task. send_activation_email = shared_task(bind=True, name=_OLD_TASK_NAME)(_send_activation_email) shared_task(bind=True, name=_NEW_TASK_NAME)(_send_activation_email) -======= ->>>>>>> Applied pylint-amnesty to student