| Chunk |
|---|
| Conflicting content |
|---|
return node;
case JsonTokenId.ID_EMBEDDED_OBJECT:
node.add(_fromEmbedded(p, ctxt, nodeFactory));
<<<<<<< HEAD
break;
=======
break;
>>>>>>> 3aee590e9f546ad5cc59c9a75367e410bcea84ea
case JsonTokenId.ID_STRING:
node.add(nodeFactory.textNode(p.getText()));
break; |
| Solution content |
|---|
case JsonTokenId.ID_STRING:
return node;
case JsonTokenId.ID_EMBEDDED_OBJECT:
node.add(_fromEmbedded(p, ctxt, nodeFactory));
break;
node.add(nodeFactory.textNode(p.getText()));
break; |
| File |
|---|
| JsonNodeDeserializer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Break statement |