| Chunk |
|---|
| Conflicting content |
|---|
}
}
public void setResizing(boolean r) {
_resizing = r;
<<<<<<< HEAD
}
=======
>>>>>>> 135df45c25baf72b2b282025fa06af50bc90ae56
public Ellipse2D.Double getCircle() {
return _circle; |
| Solution content |
|---|
}
public void setResizing(boolean r) {
_resizing = r;
}
public Ellipse2D.Double getCircle() {
return _circle; |
| File |
|---|
| Node.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |