| Chunk |
|---|
| Conflicting content |
|---|
pout.closeList();
pout.closeTerm();
printProofInformation(refinementChainTranslators, contextTranslators,
pout);
<<<<<<< HEAD
try {
Theories.translate(project, pout);
} catch (RodinDBException e) {
e.printStackTrace();
}
=======
// FIXME THEORY-PLUGIN re-enable when the theory plugin was released
// try {
// Theories.translate(pout);
// } catch (RodinDBException e) {
// e.printStackTrace();
// }
printPragmaContents(refinementChainTranslators, contextTranslators,
pout);
>>>>>>> fe287ca8a1619da611b2f8a386dd67159e7cec9a
pout.printVariable("_Error");
pout.closeTerm(); |
| Solution content |
|---|
pout.closeTerm();
printProofInformation(refinementChainTranslators, contextTranslators,
pout);
try {
Theories.translate(project, pout);
} catch (RodinDBException e) {
e.printStackTrace();
}
printPragmaContents(refinementChainTranslators, contextTranslators,
pout);
pout.closeList();
pout.printVariable("_Error");
pout.closeTerm(); |
| File |
|---|
| EventBTranslator.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Try statement |