| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD
if (reports.length < 1) {
System.out.println("Not enough goals");
targetGoal = reports[0];
=======
if (reports.length < 3) {
if(reports.length > 0) {
System.out.println("Not enough goals");
targetGoal = reports[0];
}
>>>>>>> 94f582900e5cd85080d749634864ab615b171b83
} else {
//we we have four goals in view index 1 is the left and index 2 is right
leftGoal = reports[1]; //Recognizes the |
| Solution content |
|---|
}
if (reports.length < 3) {
if(reports.length > 0) {
System.out.println("Not enough goals");
targetGoal = reports[0];
}
} else {
//we we have four goals in view index 1 is the left and index 2 is right
leftGoal = reports[1]; //Recognizes the |
| File |
|---|
| FilterImage.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Array access |
| Attribute |
| If statement |
| Method invocation |