Michael,
I did not mean to merge the branch fix/fastq-to-fasta_toscripts into
master. I was just trying to resolve conflicts. Please let me know what I
should do about this.


On Thu, May 22, 2014 at 12:58 PM, Michael R. Crusoe <
notifications@github.com> wrote:

> In sandbox/fastq-to-fasta.py:
>
> > @@ -5,6 +5,19 @@
> >  # the three-clause BSD license; see doc/LICENSE.txt.
> >  # Contact: khmer-project@idyll.org
> >  #
> > +<<<<<<< Updated upstream
> > +=======
>
> And since you're moving this to scripts/ you should git rm this file.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/ged-lab/khmer/pull/435/files#r12960979>
> .
>