Fix conflict, 1.1.3 is correct

requirements/edx/github.txt

@@ -75,7 +75,7 @@ git+https://github.com/edx/XBlock.git@xblock-0.4.7#egg=XBlock==0.4.7
 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1
 -e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
-git+https://github.com/edx/edx-ora2.git@1.1.2#egg=ora2==1.1.2
+git+https://github.com/edx/edx-ora2.git@1.1.3#egg=ora2==1.1.3
 -e git+https://github.com/edx/edx-submissions.git@1.1.0#egg=edx-submissions==1.1.0
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 git+https://github.com/edx/i18n-tools.git@v0.2#egg=i18n-tools==v0.2