| Chunk |
|---|
| Conflicting content |
|---|
/**
* The default BEAM image coordinate reference system.
*/
<<<<<<< HEAD
public static final ImageCRS DEFAULT_IMAGE_CRS = new DefaultImageCRS(
"BEAM",
new DefaultImageDatum("BEAM", PixelInCell.CELL_CORNER),
DefaultCartesianCS.DISPLAY
);
=======
public static final ImageCRS DEFAULT_IMAGE_CRS = new DefaultImageCRS("BEAM_IMAGE_CRS",
new DefaultImageDatum("BEAM_IMAGE_DATUM", PixelInCell.CELL_CORNER),
DefaultCartesianCS.DISPLAY);
>>>>>>> 35155c8cf4de594fc9a835cdf85c2afbe9bf9760
private static final boolean CACHE_INTERMEDIATE_TILES = Boolean.getBoolean(
"beam.imageManager.enableIntermediateTileCaching"); |
| Solution content |
|---|
/**
* The default BEAM image coordinate reference system.
*/
public static final ImageCRS DEFAULT_IMAGE_CRS = new DefaultImageCRS("BEAM_IMAGE_CRS",
new DefaultImageDatum("BEAM_IMAGE_DATUM", PixelInCell.CELL_CORNER),
DefaultCartesianCS.DISPLAY);
private static final boolean CACHE_INTERMEDIATE_TILES = Boolean.getBoolean( |
| File |
|---|
| ImageManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |