From 5e060f532079fc6696305e66e5d2ccf339feb506 Mon Sep 17 00:00:00 2001 From: siarhei_hrabko Date: Thu, 19 Sep 2024 13:59:09 +0300 Subject: [PATCH] EPMRPP-95256 merge conflicts --- project-properties.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project-properties.gradle b/project-properties.gradle index d0df9ca3b..3098a379c 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -79,9 +79,9 @@ project.ext { (migrationsUrl + '/migrations/76_user_bid_extension.up.sql') : 'V076__user_bid_extension.sql', (migrationsUrl + '/migrations/77_email_server_documentation_link.up.sql') : 'V077__email_server_documentation_link.sql', (migrationsUrl + '/migrations/78_drop_redundant_index.up.sql') : 'V078__drop_redundant_index.sql', - (migrationsUrl + '/migrations/84_notification_update.up.sql') : 'V084__notification_update.sql', + (migrationsUrl + '/migrations/84_notication_update.up.sql') : 'V084_notication_update.sql', (migrationsUrl + '/migrations/86_add_retention_policy_launch.up.sql') : 'V086__add_retention_policy_launch.sql', - (migrationsUrl + '/migrations/87_add_group_enum_value.up.sql') : 'V087__add_group_enum_value.sql', + (migrationsUrl + '/migrations/87_add_group_enam_value.up.sql') : 'V087__add_group_enam_value.sql', (migrationsUrl + '/migrations/88_analytics_data_table.up.sql') : 'V088__analytics_data_table.sql', (migrationsUrl + '/migrations/90_add_user_fields.up.sql') : 'V090__scim_user_fields.sql', (migrationsUrl + '/migrations/198_add_slugify_function.up.sql') : 'V198__add_slugify_function.sql',