| Chunk |
|---|
| Conflicting content |
|---|
if (field == null) {
return aggregatorKeyword + "(*)";
}
<<<<<<< HEAD
// Hack to keep the name of the column in order to be able to access it later
return sqlKeyword + "(" + field + ") AS " + field;
=======
return aggregatorKeyword + "(" + field + ")";
>>>>>>> 4a4ccef5a15d0c63bc3f6584355e72f007033a0d
}
public static AggregatorFunction count(Enum field) { |
| Solution content |
|---|
if (field == null) {
return aggregatorKeyword + "(*)";
}
// Hack to keep the name of the column in order to be able to access it later
return aggregatorKeyword + "(" + field + ") AS " + field;
}
public static AggregatorFunction count(Enum field) { |
| File |
|---|
| AggregatorFunction.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Return statement |