Fix merge conflicts relative to master

common/djangoapps/external_auth/tests/test_ssl.py

@@ -16,22 +16,19 @@ from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from mock import Mock
 
+import external_auth.views
 from edxmako.middleware import MakoMiddleware
 from external_auth.models import ExternalAuthMap
-import external_auth.views
+from opaque_keys import InvalidKeyError
+from student.models import CourseEnrollment
 from student.roles import CourseStaffRole
 from student.tests.factories import UserFactory
-<<<<<<< HEAD
-from opaque_keys import InvalidKeyError
-=======
-from student.models import CourseEnrollment
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import loc_mapper
 from xmodule.modulestore.exceptions import InsufficientSpecificationError
 from xmodule.modulestore.tests.django_utils import (ModuleStoreTestCase,
                                                     mixed_store_config)
 from xmodule.modulestore.tests.factories import CourseFactory
->>>>>>> edx/master
 
 FEATURES_WITH_SSL_AUTH = settings.FEATURES.copy()
 FEATURES_WITH_SSL_AUTH['AUTH_USE_CERTIFICATES'] = True

common/djangoapps/student/views.py

@@ -1856,7 +1856,6 @@ def change_email_settings(request):
         track.views.server_track(request, "change-email-settings", {"receive_emails": "no", "course": course_id}, page='dashboard')
 
     return JsonResponse({"success": True})
-<<<<<<< HEAD
 
 
 @login_required
@@ -1880,5 +1879,3 @@ def token(request):
     newtoken = create_token(secret, custom_data)
     response = HttpResponse(newtoken, mimetype="text/plain")
     return response
-=======
->>>>>>> edx/master