diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2009-12-12 02:10:28 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2009-12-12 02:10:28 +0000 |
| commit | c88113683d6538dbc2f779ff57fd1ea20211abec (patch) | |
| tree | 48756d324a15b8d1d990855ad3249f607a81ebf5 /django/conf/global_settings.py | |
| parent | 353e0797920fbf5170653c9a9aabe2572a5ad214 (diff) | |
| download | django-c88113683d6538dbc2f779ff57fd1ea20211abec.tar.gz | |
[soc2009/multidb] Merged up to trunk r11810. There are many conflicts in this merge, these will be resolved in a subsequent commit.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
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 |