resolved conflicts

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java

@@ -21,6 +21,7 @@ public class ApplicationAmendmentRequestResponse {
     private List<ApplicationFormFieldResponseBean> applicationFormFields;
     private Long applicationId;
     private Long applicationEvaluationId;
+    private LocalDateTime expirationDate;
     private List<CommunicationResponseBean> commentsList;
 
 }