Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Repository
ec4547b51ea5ffd873314792fc286bb3b423c097
Switch branch/tag
edx-platform
common
lib
xmodule
xmodule
tests
test_import.py
Find file
Blame
History
Permalink
Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml.
· 206f5825
Peter Fogg
committed
Jun 14, 2013
206f5825
test_import.py
18.7 KB
Edit