Projects >> nuxeo-core >>7c7d88440740f45e0c7f23f6a937785732a9d115

Chunk
Conflicting content 
import java.security.Principal;
import java.util.Date;
<<<<<<< HEAD
import java.util.HashMap;
import java.util.List;
=======
>>>>>>> c23046a0724d758bd45b602b5337165869eacf7d
import java.util.Map;

import org.nuxeo.ecm.core.api.event.CoreEvent;
Solution content 
import java.security.Principal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.nuxeo.ecm.core.api.event.CoreEvent;
File
CoreEventImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            this.info = info;
        }
        this.principal = principal;
<<<<<<< HEAD

        // info map contains at least this 2 keys
        ((Map)this.info).put(COMMENT_ATTRIBUTE, comment);
        ((Map)this.info).put(CATEGORY_ATTRIBUTE, category);
    }

    public boolean isComposite() {
        return false;
    }

    public List getNestedEvents() {
        return null;
=======
        this.category = category;
        this.comment = comment;
>>>>>>> c23046a0724d758bd45b602b5337165869eacf7d
    }

    public String getEventId() {
Solution content 
            this.info = info;
        }
        this.principal = principal;
        // info map contains at least this 2 keys
        ((Map)this.info).put(COMMENT_ATTRIBUTE, comment);
        ((Map)this.info).put(CATEGORY_ATTRIBUTE, category);
    }

    public boolean isComposite() {
        return false;
    }

    public List getNestedEvents() {
        return null;
    }

    public String getEventId() {
File
CoreEventImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature
Return statement