mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-01-23 15:54:12 +03:00
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:
commit
9a837171b6
|
@ -14,7 +14,7 @@ Local settings
|
|||
|
||||
import socket
|
||||
import os
|
||||
from .common import * # noqa
|
||||
from .base import * # noqa
|
||||
|
||||
# DEBUG
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
|
@ -20,7 +20,7 @@ from django.utils import six
|
|||
import logging
|
||||
{% endif %}
|
||||
|
||||
from .common import * # noqa
|
||||
from .base import * # noqa
|
||||
|
||||
# SECRET CONFIGURATION
|
||||
# ------------------------------------------------------------------------------
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user