| Chunk |
|---|
| Conflicting content |
|---|
// [ifndef gwt]
long result = Representation.UNKNOWN_SIZE;
if (representation.getRange() == null) {
<<<<<<< HEAD
return representation.getSize();
} else if (representation.getRange().getSize() != Range.SIZE_MAX) {
if (representation.hasKnownSize()) {
return Math.min(representation.getRange().getIndex()
+ representation.getRange().getSize(),
representation.getSize())
- representation.getRange().getIndex();
} else {
return Representation.UNKNOWN_SIZE;
}
=======
result = representation.getSize();
>>>>>>> 9350b98aba6a1df1c808615dfa28a18580c43a2c
} else if (representation.hasKnownSize()) {
if(representation.getRange().getSize() != Range.SIZE_MAX) {
result = Math.min(representation.getRange().getSize(), representation.getSize()); |
| Solution content |
|---|
// [ifndef gwt]
if (representation.getRange() == null) {
return representation.getSize();
} else if (representation.getRange().getSize() != Range.SIZE_MAX) {
if (representation.hasKnownSize()) {
return Math.min(representation.getRange().getIndex()
+ representation.getRange().getSize(),
representation.getSize())
- representation.getRange().getIndex();
} else {
return Representation.UNKNOWN_SIZE;
}
} else if (representation.hasKnownSize()) { |
| File |
|---|
| BioUtils.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |
| Variable |