resolve conflicts

nf-core · Mar 11, 2024 · 798099c · 798099c
1 parent 61b4b66
commit 798099c
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap