From: Arnaud Delcasse <arnaud@delcasse.fr>
Date: Tue, 4 Sep 2012 19:21:43 +0000 (+0200)
Subject: Fix error during merge
X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=60cbdb2b48d0038f54294546a013aeffc94ddc90

Fix error during merge
---

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)