| Chunk |
|---|
| Conflicting content |
|---|
commandName = null;
instance = null;
}
<<<<<<< HEAD
}
=======
public String getText() {
if (textArea==null)
return "";
else
return textArea.getText();
}
}
>>>>>>> b03d9d25cf87fbc197cb667a3025a81a62e51e3a |
| Solution content |
|---|
}
commandName = null;
instance = null;
}
public String getText() {
if (textArea==null)
return "";
else
return textArea.getText();
}
|
| File |
|---|
| Recorder.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |