Browse Source

fix merge issue

bio2
George Githinji 5 years ago
parent
commit
d4358d6671
  1. 14
      bio/core/fastq.d

14
bio/core/fastq.d

@ -21,15 +21,9 @@
*/
/*
<<<<<<< HEAD
This work is based from a question I posted on forums.dlang.org.
The bio.core.fastq module is based from a question that I posted on forums.dlang.org.
I have bundled the answer as a module to support parsing fastq files with D.
Credit should go to rikki cattermole.
=======
This work is based from a question I posted on forums.dlang.org.
I have bundled the answer as a module to support parsing fastq files with D.
Credit should go to rikki cattermole.
>>>>>>> c379972f2138e4860e1764a748f8457a4bd2c0f0
Credit should go to Rikki Cattermole.
*/
module bio.core.fastq;
@ -147,11 +141,7 @@ unittest {
@SEQ_ID
GATTTGGGGTTCAAAGCAGTATCGATCAAATAGTAAATCCATTTGTTCAACTCACAGTTT
+
<<<<<<< HEAD
!''*((((***+))%%%++)(%%%%).1***-+*''))**55CCF>>>>>>CCCCCCC65
=======
!''*((((***+))%%%++)(%%%%).1***-+*''))**55CCF>>>>>>CCCCCCC65
>>>>>>> c379972f2138e4860e1764a748f8457a4bd2c0f0
"""[1 .. $];
foreach(record; FastqRecord.read(input)) {

Loading…
Cancel
Save