Commit 60cbdb2b authored by Arnaud Delcasse's avatar Arnaud Delcasse

Fix error during merge

parent 90a7047a
......@@ -17,7 +17,8 @@ import string
from settings import *
app = Flask(__name__) app.config.from_object(__name__)
app = Flask(__name__)
app.config.from_object(__name__)
oid = OpenID(app)
......
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