| Chunk |
|---|
| Conflicting content |
|---|
return null;
}
<<<<<<< HEAD
private static boolean isWhitespace(char c) {
return " \r\n\t".indexOf(c) != -1;
}
private static String[] getSurroundingWhitespace(String text) {
=======
private static String transform(String text, TextTransformer transformer) {
>>>>>>> 6aac68b090a35b65f1ba10283c7d89b0849a4032
int start = 0;
while (isWhitespace(text.charAt(start))) {
start++; |
| Solution content |
|---|
return null;
}
private static String[] getSurroundingWhitespace(String text) {
int start = 0;
while (isWhitespace(text.charAt(start))) {
start++; |
| File |
|---|
| ConvertedSOAPSampleContent.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |