Merge branch 'master' of https://github.com/alk224/akutils

Conflicts: biomtotxt.sh some kind of merge
alk224 · Feb 1, 2016 · 3312c8d · 3312c8d
2 parents 48e9b5a + a9e794e
commit 3312c8d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/biomtotxt.sh b/biomtotxt.sh
@@ -113,7 +113,13 @@ try again.
 
 		biom convert -i $1 -o $biomdir/$biomname.txt --header-key taxonomy --to-tsv --table-type="OTU table" 2>/dev/null
 		wait
+<<<<<<< HEAD
 		sed -i '/# Constructed from biom file/d' $biomdir/$biomname.txt
+=======
+
+## Remove annoying line placed by biom conversion
+	sed -i '/# Constructed from biom file/d' $biomdir/$biomname.txt
+>>>>>>> a9e794e3d9e7b650b8017d103f967942ac22f55b
 
 		if [[ -s $biomdir/$biomname.txt ]]; then
 		echo "