Resolved conflicts while syncing with master

This commit is contained in:
nisha
2025-04-29 13:57:57 +05:30
3 changed files with 26 additions and 10 deletions

View File

@@ -2674,6 +2674,15 @@
<column name="source" value="PDF_FALSE"></column>
</insert>
</changeSet>
<changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_14_04_2025.sql"/>
</changeSet>
<changeSet id="09-04-2025_NK_172550" author="Nisha Kashyap">
<sqlFile
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="25-03-2025_NK_160730" author="Nisha Kashyap">
<sqlFile dbms="postgresql"
@@ -2722,21 +2731,11 @@
</insert>
</changeSet>
<changeSet id="09-04-2025_NK_172550" author="Nisha Kashyap">
<sqlFile
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="08-04-2025_PK_160730" author="Piyush kag">
<sqlFile dbms="postgresql"
path="db/dump/create_assigned_application_view.sql"/>
</changeSet>
<changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_14_04_2025.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_154315" author="Piyush Kag">
<sqlFile dbms="postgresql"