From c6cde6a72204a9e688ea0d6dfe9550f2cb39a0fc Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Tue, 13 Aug 2013 20:12:37 -0400 Subject: [PATCH] resolve incorrect merge conflict resolution --- common/lib/xmodule/xmodule/modulestore/tests/test_xml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py b/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py index 676d928bb7..ffbce40874 100644 --- 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):