Resolved conflicts while sync with master

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -635,6 +635,7 @@ public class GepafinConstant {
     public static final String EMAIL_LOG_FETCHED="email.log.fetched";
     public static final String APPLICATION_AMENDMENT_APPROPIATE_STATUS="amendment.appropiate.status";
 
+
 }
 
 

src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java

@@ -179,6 +179,7 @@ public class EmailNotificationDao {
                 .map(DocumentEntity::getFilePath)   // or getUrl()
                 .collect(Collectors.toList());
 
+
         UserWithCompanyEntity userWithCompany=companyService.getUserWithCompany(userEntity.getId(),company.getId());
                 String companyEmail = userWithCompany.getEmail();
                 String contactEmail = userWithCompany.getContactEmail();