| Chunk |
|---|
| Conflicting content |
|---|
public static final FunctionLibrary LIBRARY;
static {
<<<<<<< HEAD
LIBRARY = JavaLibrary.ofClass("string", StringFunctions.class, "string", "makeStrings", "length", "wordCount", "concatenate", "changeCase");
}
/**
* Return the input string, as-is.
*
* This is the identity functions for strings.
*/
public static String string(String s) {
return s;
=======
LIBRARY = JavaLibrary.ofClass("string", StringFunctions.class, "string", "makeStrings", "length", "wordCount", "concatenate");
}
/**
* Return the given string, as-is.
*
* This function is used for using strings as variables in NodeBox.
*/
public static String string(String value) {
return value;
>>>>>>> 73ba692686922fa63a3b8c3445cacb2b055e2550
}
/** |
| Solution content |
|---|
public static final FunctionLibrary LIBRARY;
static {
LIBRARY = JavaLibrary.ofClass("string", StringFunctions.class, "string", "makeStrings", "length", "wordCount", "concatenate", "changeCase");
}
/**
* Return the input string, as-is.
*
* This function is used for using strings as variables in NodeBox.
*/
public static String string(String s) {
return s;
}
/** |
| File |
|---|
| StringFunctions.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Method signature |
| Return statement |
| Variable |