diff options
Diffstat (limited to 'django/conf/global_settings.py')
| -rw-r--r-- | django/conf/global_settings.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 9a08348fa5..6b8c2c885c 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -131,9 +131,12 @@ DATABASE_HOST = '' # Set to empty string for localhost. Not used wit DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. DATABASE_OPTIONS = {} # Set to empty dictionary for default. +<<<<<<< HEAD:django/conf/global_settings.py DATABASES = { } +======= +>>>>>>> master:django/conf/global_settings.py # The email backend to use. For possible shortcuts see django.core.mail. # The default is to use the SMTP backend. # Third-party backends can be specified by providing a Python path |