Permalink
Browse files

fixed merge in settings

  • Loading branch information...
2 parents 2504905 + a28b4e5 commit 521abe43c7db6a9d4618563e2224c9aa86a6a91d @tchaymore committed Jan 20, 2012
Showing with 10 additions and 1 deletion.
  1. +2 −1 .gitignore
  2. +8 −0 wordnik/settings.py
View
@@ -1,2 +1,3 @@
venv
-*.pyc
+*.pyc
+.DS_Store
View
@@ -25,6 +25,14 @@
'PASSWORD': 'Kstar77!', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ },
+ 'mysql': {
+ 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': 'wmr', # Or path to database file if using sqlite3.
+ 'USER': 'root', # Not used with sqlite3.
+ 'PASSWORD': '4Bcd3fg', # Not used with sqlite3.
+ 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}

0 comments on commit 521abe4

Please sign in to comment.