[LINT] fix modules

.github/workflows/linting_comment.yml

@@ -25,4 +25,4 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           number: ${{ steps.pr_number.outputs.pr_number }}
-          path: linting-logs/lint_results.md
+          path: linting-logs/lint_results.md
\ No newline at end of file

modules.json

@@ -74,6 +74,13 @@
                         "installed_by": [
                             "modules"
                         ]
+                    },
+                    "multiqc": {
+                        "branch": "master",
+                        "git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
+                        "installed_by": [
+                            "modules"
+                        ]
                     }
                 }
             },

modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py

@@ -3,19 +3,11 @@
 
 """Provide functions to merge multiple versions.yml files."""
 
-
-<<<<<<< HEAD
-import yaml
-import platform
-from textwrap import dedent
-
-=======
 import platform
 from textwrap import dedent
 
 import yaml
 
->>>>>>> c5796cd967b920b736acba2ee60128d6ac0338db
 
 def _make_versions_html(versions):
     """Generate a tabular HTML output of all versions for MultiQC."""