| Chunk |
|---|
| Conflicting content |
|---|
private final int END_DATE_DIALOG_ID=101; private final int START_TIME_PICKER_ID=200; private final int END_TIME_PICKER_ID=201; <<<<<<< HEAD private int startYear = 2012; private int startMonth = 5; private int startDay = 7; private int startHour = 11; private int startMinute = 0; private int endYear = 2012; private int endMonth = 5; private int endDay = 7; private int endHour = 11; private int endMinute = 0; ======= private int year, month, day, hour, minute, endYear, endMonth, endDay; >>>>>>> 4221e844ec126b1071410c2a09487b8d4f2bd704 Date actDate = new Date(System.currentTimeMillis()); |
| Solution content |
|---|
private final int END_DATE_DIALOG_ID=101; private final int START_TIME_PICKER_ID=200; private final int END_TIME_PICKER_ID=201; private int startYear = 2012; private int startMonth = 5; private int startDay = 7; private int startHour = 11; private int startMinute = 0; private int endYear = 2012; private int endMonth = 5; private int endDay = 7; private int endHour = 11; private int endMinute = 0; Date actDate = new Date(System.currentTimeMillis()); |
| File |
|---|
| NewEventActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
int selectedDay) {
// TODO Auto-generated method stub
endYear=selectedYear;
<<<<<<< HEAD
endMonth=selectedMonth+1;
endDay=selectedDay;
eventEndTimeValue.setText(""+(endMonth)+"-"+endDay+"-"+endYear);
=======
endMonth=selectedMonth;
endDay=selectedDay;
eventEndTimeValue.setText(""+(endMonth+1)+"-"+endDay+"-"+endYear);
>>>>>>> 4221e844ec126b1071410c2a09487b8d4f2bd704
}
};
private EventsDataSource eventsDataSource1; |
| Solution content |
|---|
int selectedDay) {
// TODO Auto-generated method stub
endYear=selectedYear;
endMonth=selectedMonth+1;
endDay=selectedDay;
eventEndTimeValue.setText(""+(endMonth)+"-"+endDay+"-"+endYear);
}
};
private EventsDataSource eventsDataSource1; |
| File |
|---|
| NewEventActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Variable |