Clear merging issue

SkyTruth · Nov 18, 2023 · 2ed4975 · 2ed4975
1 parent 3c8affe
commit 2ed4975
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/alembic/versions/c7c033c1cdb5_populate_aoi_chunks_table.py b/alembic/versions/c7c033c1cdb5_populate_aoi_chunks_table.py
@@ -48,16 +48,12 @@ def upgrade() -> None:
 
 
 def downgrade() -> None:
-<<<<<<< HEAD
-    """downgrade"""
-=======
     """
     Downgrade the database schema.
 
     This function clears the 'aoi_chunks' table by truncating it, effectively
     undoing the changes made by the upgrade function.
     """
->>>>>>> 5d078708752b74e3cb743f77ce85b658acb327b5
     bind = op.get_bind()
     session = orm.Session(bind=bind)
     with session.begin():