Resolved conflicts

src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java

@@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum AssignedApplicationEnum {
     OPEN ("OPEN"),
     SOCCORSO("SOCCORSO"),
+
+    AWAITING("AWAITING"),
+    
     CLOSE("CLOSE");
 
 

src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java

@@ -111,6 +111,7 @@ public enum UserActionContextEnum {
     DELETE_ASSIGNED_APPLICATION("DELETE_ASSIGNED_APPLICATION"),
     GET_ASSIGNED_APPLICATION("GET_ASSIGNED_APPLICATION"),
     UPDATE_ASSIGNED_APPLICATION_DETAILS("UPDATE_ASSIGNED_APPLICATION_DETAILS"),
+    UPDATE_ASSIGNED_APPLICATION_STATUS("UPDATE_ASSIGNED_APPLICATION_STATUS"),
     
     /** Assigned form field context  **/
     CREATE_FORM_FIELD("CREATE_FORM_FIELD"),
@@ -145,6 +146,7 @@ public enum UserActionContextEnum {
     GET_DASHBOARD_WIDGET_FOR_BENEFICIARY("GET_DASHBOARD_WIDGET_FOR_BENEFICIARY"),
     GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
     GET_AMENDMENT_DETAILS("GET_AMENDMENT_DETAILS"),
+    GET_APPLICATION_DETAILS_FOR_EVALUATION("GET_APPLICATION_DETAILS_FOR_EVALUATION"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),