ENH: new recap version update

eduNEXT · Feb 12, 2018 · 90696a6 · 90696a6
1 parent 8024e23
commit 90696a6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
@@ -185,6 +185,7 @@ git+https://github.com/proversity-org/xblock-free-text-response#egg=xblock-free-
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> remove editable flag from freetextresponse req
 git+https://github.com/proversity-org/recap-xblock.git@0.1.1#egg=recap-xblock==0.1.1
 >>>>>>> UPD: recap xblock update to taged version
@@ -200,3 +201,6 @@ git+https://github.com/proversity-org/recap-xblock.git@0.1.3#egg=recap-xblock==0
 =======
 git+https://github.com/proversity-org/recap-xblock.git@0.1.4#egg=recap-xblock==0.1.4
 >>>>>>> Proversity/make async recap instructor dash (#415)
+=======
+git+https://github.com/proversity-org/recap-xblock.git@0.1.5#egg=recap-xblock==0.1.5
+>>>>>>> ENH: new recap version update