solve conflict

McTavishLab · Nov 26, 2018 · a6c9417 · a6c9417
1 parent 109901c
commit a6c9417
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/physcraper/__init__.py b/physcraper/__init__.py
@@ -770,7 +770,7 @@ def prune_short(self, min_seqlen_perc=0.75):
         self.trim()
         self._reconciled = 1
 
-    def trim(self, taxon_missingness=0.75):
+    def trim(self, taxon_missingness=0.74):
         """ It removes bases at the start and end of alignments, if they are represented by less than 75%
         of the sequences in the alignment.
         Ensures, that not whole chromosomes get dragged in. It's cutting the ends of long sequences.

diff --git a/physcraper/concat.py b/physcraper/concat.py
@@ -890,5 +890,5 @@ def write_otu_info(self, downtorank=None):
                         rowinfo.append(tofile)
                     else:
                         rowinfo.append("-")
-                writer.writerow(rowinfo)
-                
+                writer.writerow(rowinfo)                
+