Projects >> rodl >>7f8427d4eb14e86501ef3d2da54233d4409af4a8

Chunk
Conflicting content 
                ROSRService.addAnnotation(target, URI.create(annBody.getURI()), targets);
            }
        }
<<<<<<< HEAD
=======
        for (Map.Entry e : changedURIs.entrySet()) {
            ROSRService.SMS.get().changeURIInManifestAndAnnotationBodies(target, e.getKey(), e.getValue());
        }
>>>>>>> 660c949cf9027e39f35d30fd4fe08f2f109aa3a3
        try {
            storeHistoryInformation(status.getTarget());
        } catch (URISyntaxException e) {
Solution content 
                ROSRService.addAnnotation(target, URI.create(annBody.getURI()), targets);
            }
        }
        for (Map.Entry e : changedURIs.entrySet()) {
            ROSRService.SMS.get().changeURIInManifestAndAnnotationBodies(target, e.getKey(), e.getValue());
        }
        try {
            storeHistoryInformation(status.getTarget());
        } catch (URISyntaxException e) {
File
CopyOperation.java
Developer's decision
Version 2
Kind of conflict
Other