| Chunk |
|---|
| Conflicting content |
|---|
* * data. In effect, there is a trade-off between memory usage and performances. * * <<<<<<< HEAD ======= * |
| Solution content |
|---|
* data. In effect, there is a trade-off between memory usage and performances. * * * |
| File |
|---|
| EWAHCompressedBitmap32.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |