fixing conflict

2015-07-07 15:33:29 -07:00
parent 6d384f342f 02bea85f85
commit a7d20cb3a5
4 changed files with 35 additions and 37 deletions
--- a/lemur/factory.py
+++ b/lemur/factory.py
@ -96,7 +96,6 @@ def configure_app(app, config=None):
            app.config.from_object(from_file(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'default.conf.py')))


-
 def configure_extensions(app):
    """
    Attaches and configures any needed flask extensions