| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD
//db.execSQL(getString(R.string.clean));// remove the unclean ones
=======
db.execSQL(getString(R.string.clean));// remove the unclean ones
mManager.cancelAll();
>>>>>>> 5413db6e34898268c99d2d9c8c336a73df9303fe
} catch (Exception e) {
mManager.cancelAll();
errorNotification(); |
| Solution content |
|---|
}
//db.execSQL(getString(R.string.clean));// remove the unclean ones
} catch (Exception e) {
mManager.cancelAll();
errorNotification(); |
| File |
|---|
| MALManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
//schedule();
=======
schedule(false);
>>>>>>> 5413db6e34898268c99d2d9c8c336a73df9303fe
}
private void syncManga(SQLiteDatabase db) {
if (activeConnection) { |
| Solution content |
|---|
}
}
//schedule();
}
private void syncManga(SQLiteDatabase db) {
if (activeConnection) { |
| File |
|---|
| MALManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public class main extends Activity {
private final static String LOG_NAME = "MAL Main";
<<<<<<< HEAD
private TextView title;
private ListView lv;
private Spinner spinner;
=======
private ListView lv;
>>>>>>> 5413db6e34898268c99d2d9c8c336a73df9303fe
private SQLiteDatabase db;
private SimpleCursorAdapter adapter;
private String sort; |
| Solution content |
|---|
public class main extends Activity {
private final static String LOG_NAME = "MAL Main";
private TextView title;
private ListView lv;
private Spinner spinner;
private SQLiteDatabase db;
private SimpleCursorAdapter adapter;
private String sort; |
| File |
|---|
| main.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
registerReceiver(rec, intentFilter);
<<<<<<< HEAD
=======
ipWatched = new IntegerPicker(this);
ipWatched.setTitle("Episodes Watched");
ipWatched.setOnDismissListener(new WatchDismissed());
ipScore = new IntegerPicker(this);
ipScore.setTitle("Set Score");
ipScore.setLimits(0, 10);
ipScore.setOnDismissListener(new ScoreDismissed());
>>>>>>> 5413db6e34898268c99d2d9c8c336a73df9303fe
if (perfs.getString("userName", "").equals("") || perfs.getString("api", "").equals("")) {
Intent i = new Intent(this, Preferences.class);
startActivity(i); |
| Solution content |
|---|
registerReceiver(rec, intentFilter);
if (perfs.getString("userName", "").equals("") || perfs.getString("api", "").equals("")) {
Intent i = new Intent(this, Preferences.class);
startActivity(i); |
| File |
|---|
| main.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
postIntent = true; break; case R.id.itemStatusDropped: <<<<<<< HEAD longClickRecord.watchedStatus = "dropped"; postIntent = true; break; case R.id.itemStatusOnHold: longClickRecord.watchedStatus = "on-hold"; ======= LongClickRecord.watchedStatus = "dropped"; postIntent = true; break; case R.id.itemStatusOnHold: LongClickRecord.watchedStatus = "on-hold"; >>>>>>> 5413db6e34898268c99d2d9c8c336a73df9303fe postIntent = true; break; case R.id.itemStatusPlantoWatch: |
| Solution content |
|---|
postIntent = true; break; case R.id.itemStatusDropped: longClickRecord.watchedStatus = "dropped"; postIntent = true; break; case R.id.itemStatusOnHold: longClickRecord.watchedStatus = "on-hold"; postIntent = true; break; case R.id.itemStatusPlantoWatch: |
| File |
|---|
| main.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Break statement |
| Case statement |
| Variable |