Remove HEAD markers (added by git ?)

3 years ago · 996bcf5aef
1 changed files with 0 additions and 5 deletions
--- 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