| Chunk |
|---|
| Conflicting content |
|---|
if (text.length() == 0)
return "{this} enters the battlefield " + baseEffects.getText(mode);
else
<<<<<<< HEAD
return text;
=======
return "{this} enters the battlefield " + text;
>>>>>>> 7b5abdd20fed6d022220c2394d1166c6bcf2363f
}
@Override |
| Solution content |
|---|
if (text.length() == 0)
return "When {this} enters the battlefield, " + baseEffects.getText(mode);
else
return "When {this} enters the battlefield, " + text;
}
@Override |
| File |
|---|
| EntersBattlefieldEffect.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Return statement |