resolve incorrect merge conflict resolution

2013-08-13 20:12:37 -04:00
parent 61219169d4
commit c6cde6a722
1 changed files with 1 additions and 1 deletions
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
@@ -7,7 +7,7 @@ from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.modulestore import XML_MODULESTORE_TYPE

 from .test_modulestore import check_path_to_location
-from . import DATA_DIR
+from xmodule.tests import DATA_DIR


 class TestXMLModuleStore(object):