From 5ee5beafbef101d6c6a705dd9051a6e722547dc7 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Tue, 13 Aug 2013 12:42:24 -0400
Subject: [PATCH] fix bad merge conflict resolution

---
 lms/djangoapps/courseware/tests/test_video_mongo.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index af71e15be7..3436938cc0 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -104,17 +104,10 @@ class TestVideoNonYouTube(TestVideo):
 
         expected_context = {
             'data_dir': getattr(self, 'data_dir', None),
-<<<<<<< HEAD
-            'caption_asset_path': '/c4x/MITx/999/asset/subs_',
+            'caption_asset_path': '/static/subs/',
             'show_captions': 'true',
             'display_name': 'A Name',
             'end': 3610.0,
-=======
-            'caption_asset_path': '/static/subs/',
-            'show_captions': self.item_module.show_captions,
-            'display_name': self.item_module.display_name_with_default,
-            'end': self.item_module.end_time,
->>>>>>> fix tests
             'id': self.item_module.location.html_id(),
             'sources': sources,
             'start': 3603.0,