removed merge conflict stuff

geerlingguy · Mar 6, 2020 · 4591b3b · 4591b3b
1 parent ad746b5
commit 4591b3b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
@@ -22,11 +22,7 @@
   rpm_key:
     state: present
     key: "{{ jenkins_repo_key_url }}"
-<<<<<<< HEAD
   when: jenkins_repo_url | default(false)
-=======
-  when: jenkins_repo_url != ''
->>>>>>> a0add32f611625bb9d515fd6c15a7fccac5d8c23
   register: get_result
   until: get_result is success
   retries: 3