remove conflict marker

2025-04-25 08:13:33 +02:00
parent e26aaa1420
commit 525d82cbda
4 changed files with 2 additions and 13 deletions
@@ -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