| Chunk |
|---|
| Conflicting content |
|---|
String[] rows = splitInRows(stripProperties(tableAsString.trim()));
for (int row = 0; row < rows.length; row++) {
String rowAsString = rows[row];
<<<<<<< HEAD
if (rowAsString.startsWith(ignorableSeparator) || rowAsString.length()==0) {
=======
if (rowAsString.startsWith(properties.getProperty("ignorableSeparator", ignorableSeparator)) || rowAsString.length()==0) {
>>>>>>> 940339e41ed0faf3291f7cef27f0e3c747f6d299
// skip empty lines and rows that start with ignorable separator
continue;
} else if (row == 0) { |
| Solution content |
|---|
String[] rows = splitInRows(stripProperties(tableAsString.trim()));
for (int row = 0; row < rows.length; row++) {
String rowAsString = rows[row];
if (rowAsString.startsWith(properties.getProperty("ignorableSeparator", ignorableSeparator)) || rowAsString.length()==0) {
// skip empty lines and rows that start with ignorable separator
continue;
} else if (row == 0) { |
| File |
|---|
| ExamplesTable.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |