Commit a16cb4b1 by e0d

resolved confict based on change branching later than the live hotfix branch

parent 0647a5b0
......@@ -9,4 +9,4 @@
# Our libraries:
-e git+https://github.com/edx/XBlock.git@483e0cb1#egg=XBlock
-e git+https://github.com/edx/codejail.git@07494f1#egg=codejail
-e git+https://github.com/edx/codejail.git@72cf791#egg=codejail
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