Projects >> goci >>efd3b065dcb3e2a4f191385185ba246186f27392

Chunk
Conflicting content 
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
import uk.ac.ebi.spot.goci.model.SingleNucleotidePolymorphism;

<<<<<<< HEAD
import java.util.Collection;
=======
import java.util.List;
>>>>>>> c0ec300971b08e262881ec7850e433a3895e4fce


/**
Solution content 
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
import uk.ac.ebi.spot.goci.model.SingleNucleotidePolymorphism;

import java.util.Collection;
import java.util.List;


/**
File
SingleNucleotidePolymorphismRepository.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
public interface SingleNucleotidePolymorphismRepository extends JpaRepository {
    SingleNucleotidePolymorphism findByRsId(String rsId);

<<<<<<< HEAD
    SingleNucleotidePolymorphism findByRsIdIgnoreCase(String rsId);

    Collection findByRiskAllelesLociAssociationStudyId(Long studyId);
=======
   List findByRsIdIgnoreCase(String rsId);
>>>>>>> c0ec300971b08e262881ec7850e433a3895e4fce
}
Solution content 
public interface SingleNucleotidePolymorphismRepository extends JpaRepository {
    SingleNucleotidePolymorphism findByRsId(String rsId);

    List findByRsIdIgnoreCase(String rsId);

    Collection findByRiskAllelesLociAssociationStudyId(Long studyId);
}
File
SingleNucleotidePolymorphismRepository.java
Developer's decision
Combination
Kind of conflict
Method interface