Resolved Conflicts
This commit is contained in:
@@ -485,10 +485,11 @@ public class GepafinConstant {
|
||||
public static final String USAGE="usage";
|
||||
public static final String LIMIT="limit";
|
||||
public static final String DATA="data";
|
||||
|
||||
public static final String FILE_SELECT = "fileselect";
|
||||
public static final String INVALID_LIMIT = "error.invalid.limit";
|
||||
public static final String PREFERRED_CALL_ID="preferredCallId";
|
||||
|
||||
public static final String REGION_ID="regionId";
|
||||
public static final String DELEGATION_TEMPLATE_CONFIDI="DELEGATION_TEMPLATE_CONFIDI";
|
||||
|
||||
public static final String EMAIL_SUPPORT = "email_support";
|
||||
public static final String PHONE_SUPPORT = "phone_support";
|
||||
|
||||
Reference in New Issue
Block a user