Fix git issue

733faeba · Vik Paruchuri · 5a51d142 · 733faeba
Commit 733faeba authored Feb 06, 2013 by Vik Paruchuri
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 4 deletions

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+1 -4

No files found.
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -159,11 +159,8 @@ class OpenEndedModuleTest(unittest.TestCase):
            'max_score': max_score,
            'display_name': 'Name',
            'accept_file_upload': False,
-<<<<<<< HEAD
            'rewrite_content_links' : "",
-=======
-            'close_date': None
->>>>>>> origin/master
+            'close_date': None,
            }

    oeparam = etree.XML('''