From 996bcf5aef0215d220076bc2eb6a7da2234a999c Mon Sep 17 00:00:00 2001
From: Julien Escario <julien.escario@altinea.fr>
Date: Thu, 16 Sep 2021 11:35:34 +0200
Subject: [PATCH] Remove HEAD markers (added by git ?)

---
 foreman/altinea_puppet_install.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/foreman/altinea_puppet_install.sh b/foreman/altinea_puppet_install.sh
index 5e28f91..0053d10 100644
--- a/foreman/altinea_puppet_install.sh
+++ b/foreman/altinea_puppet_install.sh
@@ -20,9 +20,4 @@ echo "[agent]
   listen = false
   pluginsync = true
   report = true"> /etc/puppetlabs/puppet/puppet.conf
-<<<<<<< HEAD
-/opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true
-source /etc/profile.d/puppet-agent.sh
-=======
 /opt/puppetlabs/bin/puppet resource service puppet ensure=running enable=true && source /etc/profile.d/puppet-agent.sh
->>>>>>> 9445dfb1bbfede6154b563ce82418b59afa7df80