This commit is contained in:
Claudio Atzori 2020-11-05 17:10:24 +01:00
parent e5da4ee9b1
commit 2d76497488
1 changed files with 1 additions and 4 deletions

View File

@ -134,10 +134,7 @@ public class GenerateEntitiesApplication {
return o1;
}
protected static Result mergeResults(Result o1, Result o2) {
Result r1 = o1;
Result r2 = o2;
protected static Result mergeResults(Result r1, Result r2) {
if (new ResultTypeComparator().compare(r1, r2) < 0) {
r1.mergeFrom(r2);
return r1;