resolved confict based on change branching later than the live hotfix branch
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user