Rebasing error fixed!

nf-core · Apr 25, 2023 · 87bb378 · 87bb378
1 parent 437148c
commit 87bb378
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/nf_core/pipeline-template/nextflow.config b/nf_core/pipeline-template/nextflow.config
@@ -130,10 +130,7 @@ profiles {
     }
     podman {
         podman.enabled         = true
-<<<<<<< HEAD
-=======
         podman.registry        = 'quay.io'
->>>>>>> dd0b25eb (Add podman.registry config option)
         conda.enabled          = false
         docker.enabled         = false
         singularity.enabled    = false