From 798099c685bf5b9c9cb7f6294efe7cb1bb7bcd24 Mon Sep 17 00:00:00 2001
From: asp8200 <anders@mynucleus.com>
Date: Mon, 11 Mar 2024 15:07:54 +0000
Subject: [PATCH] resolve conflicts

---
 .../nf-core/multiqc/tests/main.nf.test.snap   | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/modules/nf-core/multiqc/tests/main.nf.test.snap b/modules/nf-core/multiqc/tests/main.nf.test.snap
index f51e9cb6..7c3ff588 100644
--- a/modules/nf-core/multiqc/tests/main.nf.test.snap
+++ b/modules/nf-core/multiqc/tests/main.nf.test.snap
@@ -2,22 +2,14 @@
     "multiqc_versions_single": {
         "content": [
             [
-<<<<<<< HEAD
-                "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186"
-=======
                 "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d"
->>>>>>> dev
             ]
         ],
         "meta": {
             "nf-test": "0.8.4",
             "nextflow": "23.10.1"
         },
-<<<<<<< HEAD
-        "timestamp": "2024-02-14T09:28:51.744211298"
-=======
         "timestamp": "2024-02-29T08:48:55.657331"
->>>>>>> dev
     },
     "multiqc_stub": {
         "content": [
@@ -25,41 +17,25 @@
                 "multiqc_report.html",
                 "multiqc_data",
                 "multiqc_plots",
-<<<<<<< HEAD
-                "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186"
-=======
                 "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d"
->>>>>>> dev
             ]
         ],
         "meta": {
             "nf-test": "0.8.4",
             "nextflow": "23.10.1"
         },
-<<<<<<< HEAD
-        "timestamp": "2024-02-14T09:29:28.847433492"
-=======
         "timestamp": "2024-02-29T08:49:49.071937"
->>>>>>> dev
     },
     "multiqc_versions_config": {
         "content": [
             [
-<<<<<<< HEAD
-                "versions.yml:md5,d320d4c37e349c5588e07e7a31cd4186"
-=======
                 "versions.yml:md5,21f35ee29416b9b3073c28733efe4b7d"
->>>>>>> dev
             ]
         ],
         "meta": {
             "nf-test": "0.8.4",
             "nextflow": "23.10.1"
         },
-<<<<<<< HEAD
-        "timestamp": "2024-02-14T09:29:13.223621555"
-=======
         "timestamp": "2024-02-29T08:49:25.457567"
->>>>>>> dev
     }
 }