From 0ad434ada584fd81b7b42e7c1088d9b0d0b3ac43 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 6 Jul 2023 19:52:31 +0800 Subject: [PATCH] resolve conflicts --- ...to_subscriptions.sql => 0115.do.add_type_to_subscriptions.sql} | 0 ..._subscriptions.sql => 0115.undo.add_type_to_subscriptions.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename packages/db/migrations/{0114.do.add_type_to_subscriptions.sql => 0115.do.add_type_to_subscriptions.sql} (100%) rename packages/db/migrations/{0114.undo.add_type_to_subscriptions.sql => 0115.undo.add_type_to_subscriptions.sql} (100%) diff --git a/packages/db/migrations/0114.do.add_type_to_subscriptions.sql b/packages/db/migrations/0115.do.add_type_to_subscriptions.sql similarity index 100% rename from packages/db/migrations/0114.do.add_type_to_subscriptions.sql rename to packages/db/migrations/0115.do.add_type_to_subscriptions.sql diff --git a/packages/db/migrations/0114.undo.add_type_to_subscriptions.sql b/packages/db/migrations/0115.undo.add_type_to_subscriptions.sql similarity index 100% rename from packages/db/migrations/0114.undo.add_type_to_subscriptions.sql rename to packages/db/migrations/0115.undo.add_type_to_subscriptions.sql