| Chunk |
|---|
| Conflicting content |
|---|
chromosomePositions.add(Integer.parseInt(snp.getChromosomePosition()));
}
snp.getRegions().forEach(region -> regions.add(region.getName()));
<<<<<<< HEAD
snp.getGenes().forEach(gene -> reportedGenes.add(gene.getGeneName()));
=======
snp.getGenomicContexts().forEach(
context -> genes.add(context.getGene().getGeneName()));
>>>>>>> 67d227a9eebdcb1b87561e97f85d34feb52af4cb
DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
df.setTimeZone(TimeZone.getTimeZone("UTC"));
if (snp.getLastUpdateDate() != null) { |
| Solution content |
|---|
chromosomePositions.add(Integer.parseInt(snp.getChromosomePosition()));
}
snp.getRegions().forEach(region -> regions.add(region.getName()));
snp.getGenomicContexts().forEach(
context -> mappedGenes.add(context.getGene().getGeneName()));
DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
df.setTimeZone(TimeZone.getTimeZone("UTC"));
if (snp.getLastUpdateDate() != null) { |
| File |
|---|
| AssociationDocument.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Other |