From 8b050e89eb256ed5d887f7d994ada7172e32198e Mon Sep 17 00:00:00 2001
From: SoulGateKey <soulgatekey@gmail.com>
Date: Thu, 15 May 2025 03:53:42 +0800
Subject: [PATCH] fix conflict mark

---
 .../5cf98cfe52ad_mai2_prism_support.py        | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py b/core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
index cf4287c..d3296cd 100644
--- a/core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
+++ b/core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
@@ -1,14 +1,8 @@
 """Mai2 PRiSM support
 
-<<<<<<<< HEAD:core/data/alembic/versions/5d7b38996e67_mai2_prism_support.py
-Revision ID: 5d7b38996e67
-Revises: 1d0014d35220
-Create Date: 2025-04-04 06:28:24.898912
-========
 Revision ID: 5cf98cfe52ad
 Revises: 263884e774cc
 Create Date: 2025-04-08 08:00:51.243089
->>>>>>>> refs/heads/develop:core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
 
 """
 from alembic import op
@@ -16,32 +10,15 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-<<<<<<<< HEAD:core/data/alembic/versions/5d7b38996e67_mai2_prism_support.py
-revision = '5d7b38996e67'
-down_revision = '1d0014d35220'
-========
+
 revision = '5cf98cfe52ad'
 down_revision = '263884e774cc'
->>>>>>>> refs/heads/develop:core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-<<<<<<<< HEAD:core/data/alembic/versions/5d7b38996e67_mai2_prism_support.py
-    op.create_table('mai2_static_kaleidxscope_condition',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('conditionId', sa.Integer(), nullable=True),
-    sa.Column('conditionName', sa.String(length=255), nullable=True),
-    sa.Column('songId', sa.Integer(), nullable=True),
-    sa.Column('songName', sa.String(length=255), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('conditionId', 'conditionName', 'songId', 'songName', name='mai2_static_kaleidxscope_uk'),
-    mysql_charset='utf8mb4'
-    )
-========
->>>>>>>> refs/heads/develop:core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
     op.create_table('mai2_score_kaleidxscope',
     sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('user', sa.Integer(), nullable=False),
@@ -73,8 +50,4 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('mai2_playlog', 'extBool2')
     op.drop_table('mai2_score_kaleidxscope')
-<<<<<<<< HEAD:core/data/alembic/versions/5d7b38996e67_mai2_prism_support.py
-    op.drop_table('mai2_static_kaleidxscope_condition')
-========
->>>>>>>> refs/heads/develop:core/data/alembic/versions/5cf98cfe52ad_mai2_prism_support.py
     # ### end Alembic commands ###