| Chunk |
|---|
| Conflicting content |
|---|
}
// To correct interrogation point (?) problem in the locale file.
Matcher regexMatcher = buggedLocale.matcher(result);
<<<<<<< HEAD
result = regexMatcher.replaceAll("§$1");
=======
ResultString = null;
if(regexMatcher.find())
result = regexMatcher.replaceAll("§$1");
>>>>>>> 7f897b64f620a05002b94d811d939b6a5db49e46
return result;
}
|
| Solution content |
|---|
}
// To correct interrogation point (?) problem in the locale file.
Matcher regexMatcher = buggedLocale.matcher(result);
result = regexMatcher.replaceAll("§$1");
return result;
}
|
| File |
|---|
| LocaleManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |