| Chunk |
|---|
| Conflicting content |
|---|
setLocationRelativeTo(null); // open window with notifications <<<<<<< HEAD List |
| Solution content |
|---|
setLocationRelativeTo(null); // open window with notifications List |
| File |
|---|
| MainWindow.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |