From 733faebaf0bd1a3c4c52c38438409e0490203de8 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 6 Feb 2013 15:28:05 -0500
Subject: [PATCH] Fix git issue

---
 common/lib/xmodule/xmodule/tests/test_combined_open_ended.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index cb30af7901..2981ce9833 100644
--- 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('''