Skip to content

E
edx-platform
Commit 393e885e by Cliff Dyer
Options

Merge pull request #12015 from edx/cdyer/broken-master-20160401 

Fix broken import due to merging oauth changes to master
parents 8e42e617 845b0261
Showing with 1 additions and 1 deletions
lms/djangoapps/learner_dashboard/tests/test_programs.py
...@@ -10,7 +10,7 @@ from django.conf import settings ...@@ -10,7 +10,7 @@ from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.test import override_settings from django.test import override_settings
from oauth2_provider.tests.factories import ClientFactory from edx_oauth2_provider.tests.factories import ClientFactory
from opaque_keys.edx import locator from opaque_keys.edx import locator
from provider.constants import CONFIDENTIAL from provider.constants import CONFIDENTIAL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment