Skip to content

E
edx-platform
Commit c6cde6a7 by Chris Dodge
Options

resolve incorrect merge conflict resolution

parent 61219169
Showing with 1 additions and 1 deletions
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):
......
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