Skip to content

Commit 097a543

Browse files
committed
Merge conflict fix
1 parent 51583fe commit 097a543

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed
File renamed without changes.

src/main/resources/config/liquibase/master.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<include file="classpath:config/liquibase/changelog/20250731140151_changelog.xml" relativeToChangelogFile="false"/>
4545
<include file="classpath:config/liquibase/changelog/20250802175051_changelog.xml" relativeToChangelogFile="false"/>
4646
<include file="classpath:config/liquibase/changelog/20250911170100_changelog.xml" relativeToChangelogFile="false"/>
47-
<include file="classpath:config/liquibase/changelog/20250915121343_changelog.xml" relativeToChangelogFile="false"/>
4847
<include file="classpath:config/liquibase/changelog/20250920163252_changelog.xml" relativeToChangelogFile="false"/>
4948
<include file="classpath:config/liquibase/changelog/20250930145942_changelog.xml" relativeToChangelogFile="false"/>
49+
<include file="classpath:config/liquibase/changelog/20251006234500_changelog.xml" relativeToChangelogFile="false"/>
5050
<!-- NOTE: please use the format "YYYYMMDDhhmmss_changelog.xml", i.e. year month day hour minutes seconds and not something else! -->
5151
<!-- we should also stay in a chronological order! -->
5252
<!-- you can use the command 'date '+%Y%m%d%H%M%S' to get the current date and time in the correct format -->

0 commit comments

Comments
 (0)