From 609245cef78e1bea0c8eb515fb99e22b72f9c1b4 Mon Sep 17 00:00:00 2001 From: ahakanzn Date: Mon, 21 Oct 2024 13:54:20 +0200 Subject: [PATCH] resolve conflict for liquidbase files --- ...{144-isil-clb-identifiers.xml => 147-isil-clb-identifiers.xml} | 0 ...ntifier-grscicoll.xml => 148-primary-identifier-grscicoll.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename registry-persistence/src/main/resources/liquibase/{144-isil-clb-identifiers.xml => 147-isil-clb-identifiers.xml} (100%) rename registry-persistence/src/main/resources/liquibase/{145-primary-identifier-grscicoll.xml => 148-primary-identifier-grscicoll.xml} (100%) diff --git a/registry-persistence/src/main/resources/liquibase/144-isil-clb-identifiers.xml b/registry-persistence/src/main/resources/liquibase/147-isil-clb-identifiers.xml similarity index 100% rename from registry-persistence/src/main/resources/liquibase/144-isil-clb-identifiers.xml rename to registry-persistence/src/main/resources/liquibase/147-isil-clb-identifiers.xml diff --git a/registry-persistence/src/main/resources/liquibase/145-primary-identifier-grscicoll.xml b/registry-persistence/src/main/resources/liquibase/148-primary-identifier-grscicoll.xml similarity index 100% rename from registry-persistence/src/main/resources/liquibase/145-primary-identifier-grscicoll.xml rename to registry-persistence/src/main/resources/liquibase/148-primary-identifier-grscicoll.xml