Resolved conflicts

2025-04-17 13:14:56 +05:30
parent 809c89deed 9699964b09
commit b13a31b80e
17 changed files with 395 additions and 80 deletions
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2728,4 +2728,13 @@
                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>
 </databaseChangeLog>