| Chunk |
|---|
| Conflicting content |
|---|
win = performDestroy(r, finish);
if (finish) {
mActivities.remove(id);
<<<<<<< HEAD
mActivityArray.remove(r);
=======
>>>>>>> c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0
}
}
return win; |
| Solution content |
|---|
win = performDestroy(r, finish);
if (finish) {
mActivities.remove(id);
mActivityArray.remove(r);
}
}
return win; |
| File |
|---|
| LocalActivityManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |