From a16cb4b1342d98af8ebfb230945b0b815ea13be2 Mon Sep 17 00:00:00 2001 From: e0d Date: Thu, 23 May 2013 12:35:36 -0400 Subject: [PATCH] resolved confict based on change branching later than the live hotfix branch --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index d3f90d5abc..936c5709ae 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -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