| Chunk |
|---|
| Conflicting content |
|---|
}
public String getLanguageLongName(String shortName){
<<<<<<< HEAD
return get("language", shortName);
=======
if("en".equalsIgnoreCase(shortName)){
return "English";
}else if("tr".equalsIgnoreCase(shortName)){
return "T\u00fcrk\u00e7e";
}
return "";
>>>>>>> c28dc9cfebef391954dca0d4bbcd96493dfeed00
}
public boolean checkLanguageIsValid(String lang){ |
| Solution content |
|---|
}
public String getLanguageLongName(String shortName){
return get("language", shortName);
}
public boolean checkLanguageIsValid(String lang){ |
| File |
|---|
| LocalizationUtil.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |