From bef379273f4786f9a5aa563a1623cddcfa8e5451 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.cyberia@doesthisthing.work>
Date: Sat, 17 Jul 2021 13:31:32 +0200
Subject: [PATCH] Fix botched merge

---
 capsulflask/__init__.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/capsulflask/__init__.py b/capsulflask/__init__.py
index 5f25c45..09ef1ab 100644
--- a/capsulflask/__init__.py
+++ b/capsulflask/__init__.py
@@ -188,17 +188,17 @@ def create_app():
     auth, landing, console, payment, metrics, cli, hub_api, publicapi, admin
   )
 
-    app.register_blueprint(landing.bp)
-    app.register_blueprint(auth.bp)
-    app.register_blueprint(console.bp)
-    app.register_blueprint(payment.bp)
-    app.register_blueprint(metrics.bp)
-    app.register_blueprint(cli.bp)
-    app.register_blueprint(hub_api.bp)
-    app.register_blueprint(admin.bp)
+  app.register_blueprint(auth.bp)
+  app.register_blueprint(landing.bp)
+  app.register_blueprint(console.bp)
+  app.register_blueprint(payment.bp)
+  app.register_blueprint(metrics.bp)
+  app.register_blueprint(cli.bp)
+  app.register_blueprint(hub_api.bp)
+  app.register_blueprint(admin.bp)
   app.register_blueprint(publicapi.bp)
 
-    app.add_url_rule("/", endpoint="index")
+  app.add_url_rule("/", endpoint="index")
 
   if app.config['SPOKE_MODE_ENABLED']:
     if app.config['SPOKE_MODEL'] == "shell-scripts":
@@ -254,4 +254,3 @@ def create_app():
     return url_for(endpoint, **values)
 
   return app
->>>>>>> tests