Resolved conflicts

2024-11-15 20:06:33 +05:30
parent 7485cead14 3d107e65fb
commit f4034534d7
23 changed files with 362 additions and 242 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -93,9 +93,6 @@ public class ApplicationDao {
    @Value("${default_System_Receiver_Email}")
 	private String defaultSystemReceiverEmail;
    
-    @Value("${gepafin_email}")
-	private String gepafinEmail;
-    
    @Value("${rinaldo_email}")
 	private String rinaldoEmail;