diff test-data/biom_out.html @ 1:22abc415e142 draft default tip

"planemo upload for repository https://github.com/QFAB-Bioinformatics/metaDEGalaxy/tree/master/phyloseq_net commit dd99d48abe2b118e0ff59ad36da4b641b83037ff"
author qfabrepo
date Wed, 16 Sep 2020 05:42:51 +0000
parents af6d9ad14a0f
children
line wrap: on
line diff
--- a/test-data/biom_out.html	Mon Sep 14 08:13:43 2020 +0000
+++ b/test-data/biom_out.html	Wed Sep 16 05:42:51 2020 +0000
@@ -2,11 +2,7 @@
 <table align="center">
 <tr>
 <td valign="middle" style="vertical-align:middle;">
-<<<<<<< HEAD
 <a href="pdffile.pdf"><img src="net.png"/></a>
-=======
-<a href="pdffile.pdf"><img src="nmds.png" width="800" height="800"/></a>
->>>>>>> 7071f56839dc493d472263deb5bf5bf3e3909674
 </td>
 </tr>
 </table>