# HG changeset patch
# User cavaliet
# Date 1299683543 -3600
# Node ID 47504376ee9db302790541beb6a2e81d9cfa41ba
# Parent  457d4ab675dfd4696c12600c379b757a9c3b3417
merge

diff -r 457d4ab675df -r 47504376ee9d .pydevproject
--- a/.pydevproject	Wed Mar 09 16:05:31 2011 +0100
+++ b/.pydevproject	Wed Mar 09 16:12:23 2011 +0100
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_platform</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/platform/src/ldt</path>
-<path>/platform/web</path>
-</pydev_pathproperty>
-</pydev_project>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_platform</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/platform/src/ldt</path>
+<path>/platform/web</path>
+</pydev_pathproperty>
+</pydev_project>
diff -r 457d4ab675df -r 47504376ee9d web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py	Wed Mar 09 16:05:31 2011 +0100
+++ b/web/ldtplatform/settings.py	Wed Mar 09 16:12:23 2011 +0100
@@ -13,7 +13,7 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': '',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
@@ -149,7 +149,7 @@
 OAUTH_PROVIDER_CONSUMER_KEY_SIZE = 256
 OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view'
 OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view'
-TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8000"
+TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888"
 
 from config import *