Fix merge conflict in DB migrations (#12336)

This commit is contained in:
Tim O'Farrell
2026-01-08 22:46:43 -07:00
committed by GitHub
parent d4cf1d4590
commit 0e4f0c25d7
2 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
"""bump condenser defaults: max_size 120->240
Revision ID: 086
Revises: 085
Revision ID: 087
Revises: 086
Create Date: 2026-01-05
"""
@@ -13,8 +13,8 @@ from alembic import op
from sqlalchemy.sql import column, table
# revision identifiers, used by Alembic.
revision: str = '086'
down_revision: Union[str, None] = '085'
revision: str = '087'
down_revision: Union[str, None] = '086'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None

View File

@@ -1,7 +1,7 @@
"""create blocked_email_domains table
Revision ID: 087
Revises: 086
Revision ID: 088
Revises: 087
Create Date: 2025-01-27 00:00:00.000000
"""
@@ -12,8 +12,8 @@ import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = '087'
down_revision: Union[str, None] = '086'
revision: str = '088'
down_revision: Union[str, None] = '087'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None