remove conflict marker

kontor-scripts/export.py

@@ -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
 

kontor-scripts/schema/comic.py

@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:kontor-scripts/schema/comic.py
 from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.dialects.mysql import BIT
-========
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
->>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/comic.py
 from sqlalchemy.orm import relationship
 
 from .base import Base, BaseMixin

kontor-scripts/schema/metadata.py

@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:kontor-scripts/schema/metadata.py
 from sqlalchemy import Column, String, ForeignKey, Integer
 from sqlalchemy.dialects.mysql import BIT
-========
-from sqlalchemy import Column, String, ForeignKey, Integer, Boolean
->>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/metadata.py
 from sqlalchemy.orm import relationship
 
 from .base import Base, BaseMixin

kontor-scripts/schema/tysc.py

@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:kontor-scripts/schema/tysc.py
 from sqlalchemy import Column, Integer, String, ForeignKey, UniqueConstraint
 from sqlalchemy.dialects.mysql import BIT
-========
-from sqlalchemy import Boolean, Column, Integer, String, ForeignKey, UniqueConstraint
->>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/tysc.py
 from sqlalchemy.orm import relationship
 
 from .base import Base, BaseMixin