From 0eb6b2a6be16a00104db60d43824f70afa950b0d Mon Sep 17 00:00:00 2001 From: UmanShahzad Date: Wed, 17 May 2017 10:48:53 -0400 Subject: [PATCH] Rename ActiveTable max_score to maximum_score to avoid conflicts. See https://openedx.atlassian.net/browse/EDUCATOR-338 We defined max_score as a Float XBlock field, while a method max_score exists that was getting conflicts with it. --- requirements/edx/edx-private.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index ae9b5830e5..9cbdbd21da 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -34,4 +34,4 @@ ubcpi-xblock==0.6.2 # Vector Drawing and ActiveTable XBlocks (Davidson) -e git+https://github.com/open-craft/xblock-vectordraw.git@v0.2.1#egg=xblock-vectordraw==0.2.1 --e git+https://github.com/open-craft/xblock-activetable.git@1786a2c8fc06ca3ecfac1972464048982bd486ff#egg=xblock-activetable +-e git+https://github.com/open-craft/xblock-activetable.git@e933d41bb86a8d50fb878787ca680165a092a6d5#egg=xblock-activetable