| Chunk |
|---|
| Conflicting content |
|---|
@Override
public String toString() {
<<<<<<< HEAD
return "Piece [position = " + position +
", bet = " + bet + "]";
=======
return "Piece [position=" + position + ", bet=" + bet + "]";
>>>>>>> 4b525b278eaaf37605d89e4b8ae25a56ae3b6354
}
} |
| Solution content |
|---|
@Override
public String toString() {
return "Piece [position = " + position +
", bet = " + bet + "]";
}
} |
| File |
|---|
| Piece.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Return statement |