Fix conflicts

jazkarta · Aug 16, 2012 · 6c8e1f2 · 6c8e1f2
1 parent a080631
commit 6c8e1f2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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.
         """