Projects information

Chunk

Conflicting content
@Override public int hashCode() { <<<<<<< HEAD // you pick a hard-coded, randomly chosen, non-zero, odd number ======= // you pick a hard-coded, randomly chosen, non-zero, odd number >>>>>>> 7ac69db20fa5f517c942f9b8d72f124bd7942515 // ideally different for each class return new HashCodeBuilder(17, 37). append(super.getSGID().getRowKey()).

Conflicting content

    @Override
    public int hashCode() {
<<<<<<< HEAD
        // you pick a hard-coded, randomly chosen, non-zero, odd number
=======
	// you pick a hard-coded, randomly chosen, non-zero, odd number
>>>>>>> 7ac69db20fa5f517c942f9b8d72f124bd7942515
        // ideally different for each class
        return new HashCodeBuilder(17, 37).
                append(super.getSGID().getRowKey()).

Solution content
@Override public int hashCode() { // you pick a hard-coded, randomly chosen, non-zero, odd number // ideally different for each class return new HashCodeBuilder(17, 37). append(super.getSGID().getRowKey()).

Solution content

    @Override
    public int hashCode() {
        // you pick a hard-coded, randomly chosen, non-zero, odd number
        // ideally different for each class
        return new HashCodeBuilder(17, 37).
                append(super.getSGID().getRowKey()).

File
User.java

Developer's decision
Version 1

Kind of conflict
Comment

Projects >> seqware >>133cbeb8f3a3daac9a0d401489b06d66c2f04b98