Projects >> nuxeo >>89a0d9413810925faaa3824965545e7b0b6bf3c7

Chunk
Conflicting content 
 * @author Bogdan Stefanescu
 *
 */
<<<<<<< HEAD
public interface DocumentEntry {
=======
public interface DocumentEntry extends Entry {
>>>>>>> 89e9281c23e4332115e291dad5bef415fbeb0d47
    
    String getURI();// link rel="self"
Solution content 
 * @author Bogdan Stefanescu
 *
 */
public interface DocumentEntry extends Entry {
    
    String getURI();// link rel="self"
File
DocumentEntry.java
Developer's decision
Version 2
Kind of conflict
Interface signature