From 7f72004b50bbc4078ab7f15395643cc9fc985f9b Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 15 Aug 2012 15:53:37 -0400
Subject: [PATCH] Fix conflicts

---
 lms/djangoapps/courseware/access.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lms/djangoapps/courseware/access.py b/lms/djangoapps/courseware/access.py
index 69d9839045..e588f807da 100644
--- 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.
         """