From c0e53373844dd79338efa358868af43658d4a8d4 Mon Sep 17 00:00:00 2001
From: Amit Sethi
Date: Wed, 17 Nov 2010 23:25:09 +0530
Subject: Merging heads

---
 project/settings.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'project/settings.py')

diff --git a/project/settings.py b/project/settings.py
index b8a94ba..0287cf2 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -7,6 +7,7 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
+DEBUG=False
 DATABASE_HOST = ''
 DATABASE_PORT = ''
 
@@ -77,3 +78,29 @@ DEFAULT_FROM_EMAIL = 'admin@scipy.in'
 CURRENT_SCOPE = 'scipyin/2010'
 
 LOGIN_URL = '/%s/login' % (CURRENT_SCOPE)
+
+DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = 'scipycon.db'
+DATABASE_USER = ''
+DATABASE_PASSWORD = ''
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.comments',
+    'django.contrib.sessions',
+    'django.contrib.admin',
+    'django.contrib.sites',
+    'django.contrib.flatpages',
+    'django.contrib.markup',
+    'django.contrib.sitemaps',
+    'project.scipycon',
+    'project.scipycon.base',
+    'project.scipycon.proceedings',
+    'project.scipycon.registration',
+    'project.scipycon.user',
+    'project.scipycon.talk',
+    'tagging',
+    'robots',
+)
+
-- 
cgit