Skip to content

E
edx-platform
Commit 7f72004b by Kyle Fiedler
Options

Fix conflicts

parent ad7061e4
Showing with 0 additions and 4 deletions
lms/djangoapps/courseware/access.py
...@@ -84,12 +84,8 @@ def _has_access_course_desc(user, course, action): ...@@ -84,12 +84,8 @@ def _has_access_course_desc(user, course, action):
'staff' -- staff access to course. 'staff' -- staff access to course.
""" """
def can_load(): def can_load():
<<<<<<< Updated upstream
""" """
Can this user load this course? Can this user load this course?
=======
"""Can this user load this course?
>>>>>>> Stashed changes
NOTE: this is not checking whether user is actually enrolled in the course. NOTE: this is not checking whether user is actually enrolled in the course.
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment