Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts from rebase to master; fixed keyword error caught by

Browse Source 
pylint
This commit is contained in:
Will Daly
2013-03-28 08:58:56 -04:00
parent 27a31230bf
commit 3eefb7d5ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/tests/tests.py
View File

@@ -289,7 +289,7 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
self._assert_loads('static_tab', kwargs, descriptor) self._assert_loads('static_tab', kwargs, descriptor)
elif descriptor.location.category == 'course_info': elif descriptor.location.category == 'course_info':
self._assert_loads('info', kwargs={'course_id': course_id}, self._assert_loads('info', {'course_id': course_id},
descriptor) descriptor)
elif descriptor.location.category == 'custom_tag_template': elif descriptor.location.category == 'custom_tag_template':