| Chunk |
|---|
| Conflicting content |
|---|
String genusSpecies="";
String country="";
String locationID="";
<<<<<<< HEAD
Shepherd myShepherd;
myShepherd = new Shepherd();
myShepherd.beginDBTransaction();
String uniqueID=myShepherd.getNextEncounterNumber();
myShepherd.rollbackDBTransaction();
myShepherd.closeDBTransaction();
=======
String context="context0";
context=ServletUtilities.getContext(request);
Shepherd myShepherd=myShepherd = new Shepherd(context);
>>>>>>> 6b1612394a9308f6ac22216580383ff4c50b3b1f
if (form instanceof SubmitForm) {
System.out.println("Starting data submission..."); |
| Solution content |
|---|
String genusSpecies="";
String country="";
String locationID="";
String context="context0";
context=ServletUtilities.getContext(request);
Shepherd myShepherd=myShepherd = new Shepherd(context);
if (form instanceof SubmitForm) {
System.out.println("Starting data submission..."); |
| File |
|---|
| SubmitAction.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |