| Chunk |
|---|
| Conflicting content |
|---|
import static fitnesse.testsystems.slim.tables.ComparatorUtil.approximatelyEqual;
public abstract class SlimTable {
<<<<<<< HEAD
=======
private static final Pattern SYMBOL_ASSIGNMENT_PATTERN = Pattern.compile("\\A\\s*\\$([\\w\\p{L}]+)\\s*=\\s*\\Z");
>>>>>>> 769606bb2570cd0c0788596a8f89914654523c47
private String tableName;
private int instructionNumber = 0; |
| Solution content |
|---|
import static fitnesse.testsystems.slim.tables.ComparatorUtil.approximatelyEqual;
public abstract class SlimTable {
private String tableName;
private int instructionNumber = 0; |
| File |
|---|
| SlimTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |