| Chunk |
|---|
| Conflicting content |
|---|
} else {
setTheme(R.style.dark);
}
<<<<<<< HEAD:src/cgeo/geocaching/cgeospoilers.java
setContentView(R.layout.spoilers);
base.setTitle(activity, res.getString(R.string.cache_spoiler_images_title));
=======
setContentView(R.layout.spoilers);
>>>>>>> 6118f6489847f98d2c257671c352082974134b14:src/cgeo/geocaching/cgeoimages.java
// get parameters
Bundle extras = getIntent().getExtras(); |
| Solution content |
|---|
} else {
setTheme(R.style.dark);
}
setContentView(R.layout.spoilers);
// get parameters
Bundle extras = getIntent().getExtras(); |
| File |
|---|
| cgeoimages.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |