resolved conflicts

2024-08-28 03:02:20 +05:30
parent f96fcd3a76 c702bcda75
commit 5fc8206ecf
50 changed files with 1687 additions and 102 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
@@ -434,4 +434,12 @@
 		</addColumn>
 	</changeSet>
 	
+    <changeSet id="23-08-2024_1" author="Harish Bagora">
+        <addColumn tableName="gepafin_user">
+            <column name="reset_password_token" type="VARCHAR(255)">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+    </changeSet>
+
 </databaseChangeLog>