resolve conflict
This commit is contained in:
@@ -35,9 +35,6 @@ import we.util.MapUtil;
|
||||
*/
|
||||
public class PathMapping {
|
||||
|
||||
private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float",
|
||||
"Double", "double", "String", "string", "Long", "long", "Number", "number");
|
||||
|
||||
private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float",
|
||||
"Double", "double", "String", "string", "Long", "long", "Number", "number");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user