Fix merge conflicts

2014-05-16 14:10:50 -04:00
parent 18c91d0f1d
commit d4280e8529
9 changed files with 11 additions and 77 deletions
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1868,11 +1868,7 @@ def token(request):
    the token was issued. This will be stored with the user along with
    the id for identification purposes in the backend.
    '''
-<<<<<<< HEAD
    course_id = SlashSeparatedCourseKey.from_deprecated_string(request.GET.get("course_id"))
-=======
-    course_id = request.GET.get("course_id")
->>>>>>> edx/master
    course = course_from_id(course_id)
    dtnow = datetime.datetime.now()
    dtutcnow = datetime.datetime.utcnow()