Resolved conflict

This commit is contained in:
Piyush
2025-04-28 17:07:17 +05:30
committed by nisha
parent d68644c366
commit ec1c104f8c
4 changed files with 35 additions and 9 deletions

View File

@@ -2683,4 +2683,14 @@
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_154315" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_json_template_for_notification_28_04_2025.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_163615" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_28_04_2025.sql"/>
</changeSet>
</databaseChangeLog>