Fix conflicts

2012-08-15 15:53:37 -04:00
parent ad7061e41f
commit 7f72004b50
1 changed files with 0 additions and 4 deletions
--- a/lms/djangoapps/courseware/access.py
+++ b/lms/djangoapps/courseware/access.py
@@ -84,12 +84,8 @@ def _has_access_course_desc(user, course, action):
    'staff' -- staff access to course.
    """
    def can_load():
-<<<<<<< Updated upstream
        """
        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.
        """