| Chunk |
|---|
| Conflicting content |
|---|
initializeUI();
refreshUI();
} catch (Exception e) {
<<<<<<< HEAD
e.printStackTrace();
showDialog(0);
=======
//showDialog(0);
>>>>>>> 7d1aa3c1c17485dcf84bd9ec27b3edc9ac87fd6d
}
}
|
| Solution content |
|---|
initializeUI();
refreshUI();
} catch (Exception e) {
showDialog(0);
}
}
|
| File |
|---|
| MainPanelActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method invocation |