Projects >> jcommune >>e9bd34b6363274cbb3138ad40965e808951cdf6f

Chunk
Conflicting content 
    public void setValue(String value) {
        this.value = value;
    }
<<<<<<< HEAD

    /**
     * {@inheritDoc }
     * We need this override because AJAX calls operate with ids, not uuids.
     */
    @Override
    public boolean equals(Object obj) {
        if (this == obj) {
            return true;
        }
        if (obj == null) {
            return false;
        }
        if (getClass() != obj.getClass()) {
            return false;
        }

        UserContact other = (UserContact) obj;
        return (getId() == other.getId());
    }

    /**
     * {@inheritDoc }
     * We need this override because AJAX calls operate with ids, not uuids.
     */
    @Override
    public int hashCode() {
        return Long.valueOf(getId()).hashCode();
    }
=======
>>>>>>> d3fbe0e8d490c84bd444aa81f5b9e63bb536d565
}
Solution content 
    public void setValue(String value) {
        this.value = value;
    }
}
File
UserContact.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
    private SessionFactory sessionFactory;

    @Autowired
<<<<<<< HEAD
    private UserContactsHibernateDao dao;
=======
    private UserContactsDao dao;
>>>>>>> d3fbe0e8d490c84bd444aa81f5b9e63bb536d565

    private Session session;
Solution content 
    private SessionFactory sessionFactory;

    @Autowired
    private UserContactsDao dao;

    private Session session;
File
UserContactsHibernateDaoTest.java
Developer's decision
Version 2
Kind of conflict
Attribute