conflict was not fully resolved

trtcrd · trtcrd · commit 53b526f43325 · 2019-07-08T10:45:46.000+02:00
diff --git a/www/modules/assignment-table-IDTAXA.js b/www/modules/assignment-table-IDTAXA.js
@@ -1,7 +1,7 @@
 class AssignOtuIdTaxaModule extends Module {
   constructor (params) {
   // lien de la doc
-  super ("assignment-otu-IDTAXA", "https://github.com/trtcrd/SLIM/wiki/OTU---IDTAXA-classifier");
+  super ("assignment-table-IDTAXA", "https://github.com/trtcrd/SLIM/wiki/OTU---IDTAXA-classifier");
 
   this.params = params;
   }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`class AssignOtuIdTaxaModule extends Module {`
`2`	`2`	`constructor (params) {`
`3`	`3`	`// lien de la doc`
`4`		`- super ("assignment-otu-IDTAXA", "https://github.com/trtcrd/SLIM/wiki/OTU---IDTAXA-classifier");`
	`4`	`+ super ("assignment-table-IDTAXA", "https://github.com/trtcrd/SLIM/wiki/OTU---IDTAXA-classifier");`
`5`	`5`
`6`	`6`	`this.params = params;`
`7`	`7`	`}`