| Chunk |
|---|
| Conflicting content |
|---|
return "Sredisce ob Dravi";
case 1481:
return "Straza";
<<<<<<< HEAD
=======
case 1483:
return "Sveti Jurij v Slovenskih Goricah";
>>>>>>> 5eef24504c348cb6880642ae3eb6443f40e3b8a7
}
} else if (country_code.equals("SK")) {
switch (region_code2) { |
| Solution content |
|---|
return "Sredisce ob Dravi";
case 1481:
return "Straza";
case 1483:
return "Sveti Jurij v Slovenskih Goricah";
}
} else if (country_code.equals("SK")) {
switch (region_code2) { |
| File |
|---|
| regionName.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Case statement |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
return "Toshkent";
case 14:
return "Toshkent";
<<<<<<< HEAD
=======
case 15:
return "Jizzax";
>>>>>>> 5eef24504c348cb6880642ae3eb6443f40e3b8a7
}
} else if (country_code.equals("VC")) {
switch (region_code2) { |
| Solution content |
|---|
return "Toshkent";
case 14:
return "Toshkent";
case 15:
return "Jizzax";
}
} else if (country_code.equals("VC")) {
switch (region_code2) { |
| File |
|---|
| regionName.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Case statement |
| Return statement |