Skip to content

Commit

Permalink
Merge e40d745 into b2dd498
Browse files Browse the repository at this point in the history
  • Loading branch information
predatell committed Mar 18, 2016
2 parents b2dd498 + e40d745 commit 060f88b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions layers/loader.py
@@ -1,10 +1,10 @@
import os
import sys
from importlib import import_module

from django.template.base import TemplateDoesNotExist
from django.template import TemplateDoesNotExist
from django.template.loaders.app_directories import Loader as BaseLoader
from django.conf import settings
from django.utils.importlib import import_module
from django.core.exceptions import ImproperlyConfigured


Expand Down
2 changes: 1 addition & 1 deletion layers/middleware.py
Expand Up @@ -3,7 +3,7 @@
except ImportError:
from django.utils._threading_local import local

from django.utils.importlib import import_module
from importlib import import_module
from django.conf import settings

_thread_locals = local()
Expand Down

0 comments on commit 060f88b

Please sign in to comment.