fix: merge errors

lnbits/core/crud.py

@@ -732,7 +732,9 @@ async def update_migration_version(conn, db_name, version):
         ON CONFLICT (db) DO UPDATE SET version = ?
         """,
         (db_name, version, version),
-=======
+    )
+
+
 # tinyurl
 # -------
 

lnbits/core/migrations.py

@@ -270,6 +270,7 @@ async def m008_create_admin_settings_table(db):
     """
     )
 
+
 async def m009_create_tinyurl_table(db):
     await db.execute(
         f"""
@@ -283,6 +284,7 @@ async def m009_create_tinyurl_table(db):
     """
     )
 
+
 async def m010_create_installed_extensions_table(db):
     await db.execute(
         """

lnbits/core/models.py

@@ -217,6 +217,7 @@ class BalanceCheck(BaseModel):
 class CoreAppExtra:
     register_new_ext_routes: Callable
 
+
 class TinyURL(BaseModel):
     id: str
     url: str

lnbits/core/views/api.py

@@ -56,10 +56,10 @@ from lnbits.utils.exchange_rates import (
 from .. import core_app, core_app_extra, db
 from ..crud import (
     add_installed_extension,
-    delete_installed_extension,
-    get_dbversions,
     create_tinyurl,
+    delete_installed_extension,
     delete_tinyurl,
+    get_dbversions,
     get_payments,
     get_standalone_payment,
     get_tinyurl,
@@ -818,6 +818,8 @@ async def get_extension_releases(ext_id: str, user: User = Depends(check_admin))
     except Exception as ex:
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
 
 ############################TINYURL##################################