fix: merge errors

2023-01-25 09:56:05 +02:00
parent 9cca87f738
commit dd3fc7c2bb
4 changed files with 11 additions and 4 deletions
@@ -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
 # -------