| Chunk |
|---|
| Conflicting content |
|---|
WebSettings settings = webview.getSettings();
settings.setDefaultTextEncodingName("utf-8");
<<<<<<< HEAD
=======
//ImageView moduleIcon;
//TextView moduleText;
>>>>>>> 253ab3dc29a10fd40e87ccc8438fd1f848d59efc
int requestCode = this.getIntent().getIntExtra("requestCode", 0);
getSupportActionBar().setSubtitle(Constants.getSelectedCourseShortName()); |
| Solution content |
|---|
WebSettings settings = webview.getSettings();
settings.setDefaultTextEncodingName("utf-8");
int requestCode = this.getIntent().getIntExtra("requestCode", 0);
getSupportActionBar().setSubtitle(Constants.getSelectedCourseShortName()); |
| File |
|---|
| Information.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |