Resolved Conflicts.
This commit is contained in:
@@ -305,6 +305,7 @@ public class GepafinConstant {
|
||||
public static final String USER_ID = "userId";
|
||||
public static final String LOGIN_ATTEMPT_ID = "loginAttemptId";
|
||||
public static final String USER_ACTION_ID = "userActionId";
|
||||
public static final String ATLEAST_ONE_ID_REQUIRED="atleast.one.id.required";
|
||||
|
||||
//Appointment
|
||||
public static final String NDG_IN_PROGRESS = "IN_PROGRESS";
|
||||
|
||||
Reference in New Issue
Block a user