Resolved conflict

2025-02-06 20:41:54 +05:30
parent 322b49792a 2b0e0bb933
commit 69741f87d8
15 changed files with 365 additions and 36 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
@@ -2386,4 +2386,11 @@
            <column name="product_id" type="numeric"></column>
        </addColumn>
    </changeSet>
+    <changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
+
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_form_field_data_06-02-2025.sql"/>
+
+    </changeSet>
+
 </databaseChangeLog>