Merge in mistakenly unmerged changes.

ThePalaceProject · Dec 9, 2024 · eea4961 · eea4961
1 parent 1cc625a
commit eea4961
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/palace/manager/sqlalchemy/model/patron.py b/src/palace/manager/sqlalchemy/model/patron.py
@@ -571,7 +571,6 @@ class Hold(Base, LoanAndHoldMixin):
     """A patron is in line to check out a book."""
 
     __tablename__ = "holds"
-<<<<<<< HEAD
     id: Mapped[int] = Column(Integer, primary_key=True)
     patron_id: Mapped[int] = Column(
         Integer, ForeignKey("patrons.id"), index=True, nullable=False
@@ -582,11 +581,6 @@ class Hold(Base, LoanAndHoldMixin):
     license_pool_id: Mapped[int] = Column(
         Integer, ForeignKey("licensepools.id"), index=True, nullable=False
     )
-=======
-    id = Column(Integer, primary_key=True)
-    patron_id = Column(Integer, ForeignKey("patrons.id"), index=True, nullable=False)
-    license_pool_id = Column(Integer, ForeignKey("licensepools.id"), index=True)
->>>>>>> 0e3659672 (Make loan.patron_id and hold.patron_id fields non-nullable.)
     license_pool: Mapped[LicensePool] = relationship(
         "LicensePool", back_populates="holds"
     )