Mercurial > repos > ucsb-phylogenetics > osiris_phylogenetics

diff alignment/alignment.tool_conf @ 0:5b9a38ec4a39 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First commit of old repositories
author osiris_phylogenetics <ucsb_phylogenetics@lifesci.ucsb.edu>
date Tue, 11 Mar 2014 12:19:13 -0700
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/alignment/alignment.tool_conf	Tue Mar 11 12:19:13 2014 -0700
@@ -0,0 +1,24 @@
+<<<<<<< /home/galaxy/galaxy-dist/tools/osiris/alignment/alignment.tool_conf
+<section name="Osiris:Alignment" id="alignment">
+=======
+<section name="Osiris: Alignment" id="alignment">
+>>>>>>> /tmp/alignment.tool_conf~other.3Q5xSY
+  <label text="Alignment" id="phyloalign" />
+        <tool file="osiris/alignment/phytab_muscle.xml" />
+        <tool file="osiris/alignment/phytab_aliscorecut.xml"/>
+        <tool file="osiris/alignment/phytab_mafft.xml" />
+        <tool file="osiris/alignment/phytab_mview.xml" />
+        <tool file="osiris/alignment/phytab_prank.xml" />
+        <tool file="osiris/alignment/mview.xml" />
+        <tool file="osiris/alignment/gblocks.xml" />
+        <tool file="osiris/alignment/phytab_ssr.xml" />
+        <tool file="osiris/alignment/gap-rem.xml" />
+  <label text="Concatenation" id="concat" />
+        <tool file="osiris/alignment/fasconcat.xml" />
+        <tool file="osiris/alignment/phylocatenator.xml" />
+        <tool file="osiris/alignment/fasta_concatenate_by_species.xml" />
+  <label text="ModelTest" id="modeltest" />
+        <tool file="osiris/alignment/jmodeltest.xml"/>
+        <tool file="osiris/alignment/prottest.xml" />
+ </section>
+