| Chunk |
|---|
| Conflicting content |
|---|
COUPON_CACHE("couponCache"),
PRODUCT_GROUP_CACHE("productGroupCache"),
LSP_CACHE("lspCache"),
<<<<<<< HEAD
FULFILMENT_CACHE("fulfilmentCache");
=======
POINTS_CACHE("pointsCache");
>>>>>>> 9303bda31dd13792baf26e1e6fcd76d9e7f8892c
private String name = null;
|
| Solution content |
|---|
COUPON_CACHE("couponCache"),
PRODUCT_GROUP_CACHE("productGroupCache"),
LSP_CACHE("lspCache"),
FULFILMENT_CACHE("fulfilmentCache");
POINTS_CACHE("pointsCache");
private String name = null;
|
| File |
|---|
| NamedCachesEnum.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Enum value |