Conflicts resolved

sun13005 · Apr 21, 2017 · c73936c · c73936c
2 parents fbf6075 + 20c438e
commit c73936c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 140 deletions.
diff --git a/readseq.py → readseqs.py b/readseq.py → readseqs.py
diff --git a/tree.py b/tree.py