| Chunk |
|---|
| Conflicting content |
|---|
elements.add(new ZLTextVideoElement(it.getVideoEntry().sources()));
break;
case ZLTextParagraph.Entry.FBREADER_SPECIAL:
<<<<<<< HEAD
{
final FBReaderSpecialEntry entry = it.getFBReaderSpecialEntry();
if ("opds".equals(entry.Type)) {
try {
final String src = entry.Data.get("src");
final int count = Integer.valueOf(entry.Data.get("size"));
final BookHolder holder = HOLDER != null ? HOLDER : new BookHolder(src, count);
HOLDER = holder;
elements.addAll(holder.Elements);
} catch (Exception e) {
// ignore
}
}
break;
}
=======
break;
>>>>>>> 50712836050b7c42cc652e2c38754ac71bbfc6b5
case ZLTextParagraph.Entry.STYLE_CSS:
case ZLTextParagraph.Entry.STYLE_OTHER:
elements.add(new ZLTextStyleElement(it.getStyleEntry())); |
| Solution content |
|---|
elements.add(new ZLTextVideoElement(it.getVideoEntry().sources()));
break;
case ZLTextParagraph.Entry.FBREADER_SPECIAL:
{
final FBReaderSpecialEntry entry = it.getFBReaderSpecialEntry();
if ("opds".equals(entry.Type)) {
try {
final String src = entry.Data.get("src");
final int count = Integer.valueOf(entry.Data.get("size"));
final BookHolder holder = HOLDER != null ? HOLDER : new BookHolder(src, count);
HOLDER = holder;
elements.addAll(holder.Elements);
} catch (Exception e) {
// ignore
}
}
break;
}
case ZLTextParagraph.Entry.STYLE_CSS:
case ZLTextParagraph.Entry.STYLE_OTHER:
elements.add(new ZLTextStyleElement(it.getStyleEntry())); |
| File |
|---|
| ZLTextParagraphCursor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Break statement |
| If statement |
| Method invocation |
| Variable |