Commit 7ace51e7 authored by Benjamin S Waters's avatar Benjamin S Waters

actual fix from merge

parent a749ec92
......@@ -5,3 +5,4 @@ from flask.ext.admin import Admin
website = Flask(__name__)
website.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////database.db'
admin = Admin(website)
from website import routes
from flask_wtf import Form
<<<<<<< HEAD
from wtforms.validators import DataRequired
class FeatureReqestForm(Form):
=======
from wtforms.ext.sqlalchemy.orm import model_form
from wtforms.validators import DataRequired
from models import FeatureRequest
FeatureRequestForm = model_form(FeatureRequest, Form)
>>>>>>> dev
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment