Fix error during merge

diff --git a/main.py b/main.py
index 3ac3664..fc18674 100755 (executable)
--- 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)