Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source 
test fixes
This commit is contained in:
muhammad-ammar
2015-11-18 18:33:54 +05:00
parent 8d5f153201
commit 29acc3acfc
9 changed files with 29 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
requirements/edx/github.txt
View File

@@ -57,16 +57,9 @@ git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2
-e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
-e git+https://github.com/edx/edx-reverification-block.git@ned/upgrade-django-1.8#egg=edx-reverification-block==0.0.5
-e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client
<<<<<<< HEAD
git+https://github.com/edx/edx-organizations.git@release-2015-11-17#egg=edx-organizations==0.1.7
git+https://github.com/edx/edx-proctoring.git@0.10.20#egg=edx-proctoring==0.10.20
=======
git+https://github.com/edx/edx-organizations.git@ned/django-18#egg=edx-organizations==0.1.7
git+https://github.com/edx/edx-proctoring.git@django1.8-upgrade#egg=edx-proctoring==0.11.2
>>>>>>> origin/release
# Third Party XBlocks
-e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga
-e git+https://github.com/open-craft/xblock-poll@e7a6c95c300e95c51e42bfd1eba70489c05a6527#egg=xblock-poll
-e git+https://github.com/open-craft/xblock-poll@e7a6c95c300e95c51e42bfd1eba70489c05a6527#egg=xblock-poll