From 8c8cf4705aabc0dc1f6f7d7f4bf771e3323df082 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 23 May 2014 11:39:17 -0400 Subject: [PATCH] Resolve conflicts --- lms/djangoapps/courseware/module_render.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index bfc9565c3e..6127607b56 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -506,12 +506,8 @@ def get_module_system_for_user(user, field_data_cache, make_psychometrics_data_update_handler(course_id, user, descriptor.location) ) -<<<<<<< HEAD system.set(u'user_is_staff', has_access(user, u'staff', descriptor.location, course_id)) -======= - system.set(u'user_is_staff', has_access(user, descriptor.location, u'staff', course_id)) - system.set(u'user_is_admin', has_access(user, 'global', 'staff')) ->>>>>>> edx/master + system.set(u'user_is_admin', has_access(user, u'staff', 'global')) # make an ErrorDescriptor -- assuming that the descriptor's system is ok if has_access(user, u'staff', descriptor.location, course_id):