diff options
| author | Lei Yan | 2013-09-13 14:07:27 -0500 |
|---|---|---|
| committer | Lei Yan | 2013-09-13 14:07:27 -0500 |
| commit | af24c0d610d9a2189f86677e4f23deb372ee2bf7 (patch) | |
| tree | 53480351b97727670637a37dbd4c78e52446ae88 /wqflask/secure_server.py | |
| parent | 155e2997613c0750de30b734686f8977524956f9 (diff) | |
| parent | c5fc931621707865357ace4b637db7481e0be552 (diff) | |
| download | genenetwork2-af24c0d610d9a2189f86677e4f23deb372ee2bf7.tar.gz | |
Merge https://github.com/zsloan/genenetwork
Resolved conflicts:
wqflask/base/trait.py
wqflask/wqflask/correlation/correlationFunction.py
wqflask/wqflask/correlation/correlation_function.py
wqflask/wqflask/correlation/correlation_functions.py
wqflask/wqflask/correlation/show_corr_results.py
Diffstat (limited to 'wqflask/secure_server.py')
| -rw-r--r-- | wqflask/secure_server.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wqflask/secure_server.py b/wqflask/secure_server.py index 3487f35b..2abfdb05 100644 --- a/wqflask/secure_server.py +++ b/wqflask/secure_server.py @@ -4,12 +4,10 @@ from wqflask import app from flask import Flask, render_template - # Setup mail from flask.ext.mail import Mail mail = Mail(app) - from wqflask.model import * # Create a user to test with @@ -19,7 +17,6 @@ from wqflask.model import * # user_datastore.create_user(email='matt@example.com', password='notebook') # db.session.commit() - import logging file_handler = logging.FileHandler(app.config['LOGFILE']) file_handler.setLevel(logging.DEBUG) |