remove conflict marker

2025-04-25 08:13:33 +02:00
parent e26aaa1420
commit 525d82cbda
4 changed files with 2 additions and 13 deletions
@@ -9,7 +9,8 @@ from sqlalchemy.orm import sessionmaker
 from platformdirs import PlatformDirs
 from pathlib import Path

-from schema import Base, KontorDB
+from schema.base import Base 
+from schema.database import KontorDB
 from config import get_logger
 from schema.database import ExportType