Calen Pennington 6c546fbf1f Fix merge conflicts

2014-05-13 15:31:40 -04:00

..

data

Convert between export formats.

2014-01-30 09:22:43 -05:00

__init__.py

Course id clash command

2013-11-01 14:20:41 -04:00

test_course_id_clash.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_export_convert_format.py

Convert between export formats.

2014-01-30 09:22:43 -05:00

test_git_export.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_import.py

Fix merge conflicts

2014-05-13 15:31:40 -04:00

test_migrate_to_split.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

test_rollback_split_course.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00