From 87bb378610ef747104f96fc593c5225015a3ca06 Mon Sep 17 00:00:00 2001
From: Adam Talbot <adam.talbot@seqera.io>
Date: Tue, 25 Apr 2023 12:25:55 +0100
Subject: [PATCH] Rebasing error fixed!

---
 nf_core/pipeline-template/nextflow.config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nf_core/pipeline-template/nextflow.config b/nf_core/pipeline-template/nextflow.config
index d2c8f07653..bdf4189f16 100644
--- 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