Resolved conflict

2024-12-05 12:44:11 +05:30
parent dcaa769903 87b2d4aaaf
commit 4eeee4be16
9 changed files with 285 additions and 153 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
@@ -1968,4 +1968,15 @@
        </column>
    </addColumn>
 </changeSet>
+    <changeSet id="03-12-2024_1" author="Piyush">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_03_12_2024_1.sql"/>
+    </changeSet>
+
+    <changeSet id="04-12-2024_1" author="Nisha Kashyap">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
+    </changeSet>
+
+
 </databaseChangeLog>