resolved conflict

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java

@@ -76,6 +76,7 @@ public class ApplicationServiceImpl implements ApplicationService {
     }
     
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) {
     	return applicationDao.updateApplicationStatus(applicationId, status);