From 01d7cdc7de06e219933e3b9e39618be5d41f1027 Mon Sep 17 00:00:00 2001 From: Azalea Gui Date: Tue, 6 Feb 2024 05:26:32 -0500 Subject: [PATCH] [F] Fix conflict --- ...i_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} | 0 ...i_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} | 0 ...i_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/mariadb/{V247__add_maimai_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} (100%) rename src/main/resources/db/migration/mysql/{V247__add_maimai_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} (100%) rename src/main/resources/db/migration/sqlite/{V247__add_maimai_140_a100_events.sql => V248__add_maimai_140_a100_events.sql} (100%) diff --git a/src/main/resources/db/migration/mariadb/V247__add_maimai_140_a100_events.sql b/src/main/resources/db/migration/mariadb/V248__add_maimai_140_a100_events.sql similarity index 100% rename from src/main/resources/db/migration/mariadb/V247__add_maimai_140_a100_events.sql rename to src/main/resources/db/migration/mariadb/V248__add_maimai_140_a100_events.sql diff --git a/src/main/resources/db/migration/mysql/V247__add_maimai_140_a100_events.sql b/src/main/resources/db/migration/mysql/V248__add_maimai_140_a100_events.sql similarity index 100% rename from src/main/resources/db/migration/mysql/V247__add_maimai_140_a100_events.sql rename to src/main/resources/db/migration/mysql/V248__add_maimai_140_a100_events.sql diff --git a/src/main/resources/db/migration/sqlite/V247__add_maimai_140_a100_events.sql b/src/main/resources/db/migration/sqlite/V248__add_maimai_140_a100_events.sql similarity index 100% rename from src/main/resources/db/migration/sqlite/V247__add_maimai_140_a100_events.sql rename to src/main/resources/db/migration/sqlite/V248__add_maimai_140_a100_events.sql