resolved errors

common/djangoapps/student/management/commands/add_to_group.py

-<<<<<<< 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

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