| Chunk |
|---|
| Conflicting content |
|---|
Spec spec = (Spec) root.getRoot(Spec.SPEC_ROOT);
testXMLJSON(spec, "location", "location.xml", "location.json");
<<<<<<< HEAD
testXMLJSON(spec, "concept", "concept.xml", "concept.json");
=======
testXMLJSON(spec, "place", "placeXMLJSON.xml", "placeJSON.json");
>>>>>>> b7558169f28124609d934116d56194b3b95c2ff4
testXMLJSON(spec, "collection-object", "objectsXMLJSON.xml",
"objectsJSON.json");
|
| Solution content |
|---|
Spec spec = (Spec) root.getRoot(Spec.SPEC_ROOT);
testXMLJSON(spec, "location", "location.xml", "location.json");
<<<<<<< HEAD
testXMLJSON(spec, "concept", "concept.xml", "concept.json");
=======
testXMLJSON(spec, "place", "placeXMLJSON.xml", "placeJSON.json");
>>>>>>> upstream/master
testXMLJSON(spec, "collection-object", "objectsXMLJSON.xml",
"objectsJSON.json");
|
| File |
|---|
| TestService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
Spec spec = (Spec) root.getRoot(Spec.SPEC_ROOT);
testJSONXML(spec, "location", "location.xml", "location.json");
<<<<<<< HEAD
testJSONXML(spec, "concept", "concept.xml", "concept.json");
=======
testJSONXML(spec, "place", "placeXMLJSON.xml", "placeJSON.json");
>>>>>>> b7558169f28124609d934116d56194b3b95c2ff4
testJSONXML(spec, "collection-object", "objectsXMLJSON.xml",
"objectsJSON.json");
|
| Solution content |
|---|
Spec spec = (Spec) root.getRoot(Spec.SPEC_ROOT);
testJSONXML(spec, "location", "location.xml", "location.json");
<<<<<<< HEAD
testJSONXML(spec, "concept", "concept.xml", "concept.json");
=======
testJSONXML(spec, "place", "placeXMLJSON.xml", "placeJSON.json");
>>>>>>> upstream/master
testJSONXML(spec, "collection-object", "objectsXMLJSON.xml",
"objectsJSON.json");
|
| File |
|---|
| TestService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
tester.testUIspec(jetty, "/person/uispec", "person.uispec");
tester.testUIspec(jetty, "/location/uispec", "location.uispec");
tester.testUIspec(jetty, "/organization/uispec", "organization-authority.uispec");
<<<<<<< HEAD
tester.testUIspec(jetty, "/concept/uispec", "concept-authority.uispec");
tester.testUIspec(jetty, "/concept-search/uispec", "concept-search.uispec");
log.info("Testing UISCHEMA");
tester.testUIspec(jetty, "/person/uischema", "person.uischema");
tester.testUIspec(jetty, "/concept/uischema", "concept-authority.uischema");
tester.testUIspec(jetty, "/concept-search/uischema", "concept-search.uischema");
=======
tester.testUIspec(jetty, "/place/uispec", "place.uispec");
tester.testUIspec(jetty, "/place-search/uispec", "place-search.uispec");
log.info("Testing UISCHEMA");
tester.testUIspec(jetty, "/place/uischema", "place.uischema");
tester.testUIspec(jetty, "/place-search/uischema", "place-search.uischema");
>>>>>>> b7558169f28124609d934116d56194b3b95c2ff4
}
|
| Solution content |
|---|
tester.testUIspec(jetty, "/person/uispec", "person.uispec");
tester.testUIspec(jetty, "/location/uispec", "location.uispec");
tester.testUIspec(jetty, "/organization/uispec", "organization-authority.uispec");
<<<<<<< HEAD
tester.testUIspec(jetty, "/concept/uispec", "concept-authority.uispec");
tester.testUIspec(jetty, "/concept-search/uispec", "concept-search.uispec");
log.info("Testing UISCHEMA");
tester.testUIspec(jetty, "/person/uischema", "person.uischema");
tester.testUIspec(jetty, "/concept/uischema", "concept-authority.uischema");
tester.testUIspec(jetty, "/concept-search/uischema", "concept-search.uischema");
=======
tester.testUIspec(jetty, "/place/uispec", "place.uispec");
tester.testUIspec(jetty, "/place-search/uispec", "place-search.uispec");
log.info("Testing UISCHEMA");
tester.testUIspec(jetty, "/place/uischema", "place.uischema");
tester.testUIspec(jetty, "/place-search/uischema", "place-search.uischema");
>>>>>>> upstream/master
}
|
| File |
|---|
| TestUIRecords.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |