| Chunk |
|---|
| Conflicting content |
|---|
logOut();
} catch (Exception e) {
e.printStackTrace();
<<<<<<< HEAD
JOptionPane.showMessageDialog(this, e.toString());
=======
>>>>>>> 9cc955d7ee46d672b346510b83886a17df7c8d4d
}
}
} |
| Solution content |
|---|
logOut();
} catch (Exception e) {
e.printStackTrace();
JOptionPane.showMessageDialog(this, e.toString());
}
}
} |
| File |
|---|
| MainFrame.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |