| Chunk |
|---|
| Conflicting content |
|---|
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
<<<<<<< HEAD
Intent intent = getIntent();
myIds = intent.getStringArrayListExtra(FBReader.CATALOGS_ID_LIST);
=======
final Intent intent = getIntent();
myIds = intent.getStringArrayListExtra(IDS_LIST);
>>>>>>> 1ef5e02d45b5dd5730df1fa775f652a894733975
myInactiveIds = intent.getStringArrayListExtra(INACTIVE_IDS_LIST);
}
|
| Solution content |
|---|
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
final Intent intent = getIntent();
myIds = intent.getStringArrayListExtra(FBReader.CATALOGS_ID_LIST);
myInactiveIds = intent.getStringArrayListExtra(INACTIVE_IDS_LIST);
}
|
| File |
|---|
| AllCatalogsActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
checkBox.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
catalogItem.IsChecked = checkBox.isChecked();
<<<<<<< HEAD
setResultIds(catalogItem);
=======
myIsChanged = true;
setResult(... Intent)
>>>>>>> 1ef5e02d45b5dd5730df1fa775f652a894733975
}
});
} |
| Solution content |
|---|
checkBox.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
catalogItem.IsChecked = checkBox.isChecked();
setResultIds(catalogItem);
}
});
} |
| File |
|---|
| AllCatalogsActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |