Skip to content

E
edx-platform
Commit 733faeba by Vik Paruchuri
Options

Fix git issue

parent 5a51d142
Showing with 1 additions and 4 deletions
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
...@@ -159,11 +159,8 @@ class OpenEndedModuleTest(unittest.TestCase): ...@@ -159,11 +159,8 @@ class OpenEndedModuleTest(unittest.TestCase):
'max_score': max_score, 'max_score': max_score,
'display_name': 'Name', 'display_name': 'Name',
'accept_file_upload': False, 'accept_file_upload': False,
<<<<<<< HEAD
'rewrite_content_links' : "", 'rewrite_content_links' : "",
======= 'close_date': None,
'close_date': None
>>>>>>> origin/master
} }
oeparam = etree.XML(''' oeparam = etree.XML('''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment