| Chunk |
|---|
| Conflicting content |
|---|
if(!hasHint()) {
rawText = new RawText();
selection = rawToMask[0];
<<<<<<< HEAD
this.setText(mask.replace(charRepresentation, ' '));
}
ignore = false;
=======
this.setText(mask.replace(charRepresentation, ' '));
>>>>>>> a09e1834d8c941c92f426dd026790d4d46f9518b
maxRawLength = maskToRaw[previousValidPosition(mask.length() - 1)] + 1;
initialized = true;
|
| Solution content |
|---|
rawText = new RawText();
selection = rawToMask[0];
if(!hasHint()) {
this.setText(mask.replace(charRepresentation, ' '));
}
maxRawLength = maskToRaw[previousValidPosition(mask.length() - 1)] + 1;
initialized = true;
|
| File |
|---|
| MaskedEditText.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |