Fix error during merge

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)