Merge branch 'make-settings-consistent-w-req' of https://github.com/statwonk/cookiecutter-django into statwonk-make-settings-consistent-w-req

This commit is contained in:
Daniel Roy Greenfeld 2017-02-13 10:48:10 -08:00
commit 9a837171b6
4 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@ Local settings
import socket
import os
from .common import * # noqa
from .base import * # noqa
# DEBUG
# ------------------------------------------------------------------------------

View File

@ -20,7 +20,7 @@ from django.utils import six
import logging
{% endif %}
from .common import * # noqa
from .base import * # noqa
# SECRET CONFIGURATION
# ------------------------------------------------------------------------------

View File

@ -5,7 +5,7 @@ Test settings
- Used to run tests fast on the continuous integration server and locally
'''
from .common import * # noqa
from .base import * # noqa
# DEBUG