Revert "Changes to fix various Django 1.11 errors"

fd8f7948 · Brian Mesick · GitHub · c1d02529 · fd8f7948 · fd8f7948
Unverified Commit fd8f7948 authored Dec 13, 2017 by Brian Mesick Committed by GitHub Dec 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

cms/envs/common.py
+0 -3

openedx/tests/settings.py
+0 -1

No files found.
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1135,9 +1135,6 @@ INSTALLED_APPS = [
    # DRF filters
    'django_filters',
    'cms.djangoapps.api',
-
-    # Entitlements, used in openedx tests
-    'entitlements',
 ]



--- a/openedx/tests/settings.py
+++ b/openedx/tests/settings.py
@@ -23,7 +23,6 @@ INSTALLED_APPS = (
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'openedx.core.djangoapps.video_config',
-    'openedx.core.djangoapps.video_pipeline',
    'edxval',
 )