From 60cbdb2b48d0038f54294546a013aeffc94ddc90 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Tue, 4 Sep 2012 21:21:43 +0200 Subject: [PATCH] Fix error during merge --- main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 3ac3664..fc18674 100755 --- a/main.py +++ b/main.py @@ -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) -- 2.20.1