fix pushed conflict markers

util/jenkins/ansible-provision.sh

-#!/usr/bin/env bash
+!/usr/bin/env bash
 
 # Ansible provisioning wrapper script that
 # assumes the following parameters set
@@ -259,20 +259,14 @@ PROGRAMS_LMS_URL_ROOT: "https://${deploy_host}"
 PROGRAMS_URL_ROOT: "https://programs-${deploy_host}"
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 
-<<<<<<< HEAD
 CREDENTIALS_LMS_URL_ROOT: "https://${deploy_host}"
 CREDENTIALS_URL_ROOT: "https://credentials-${deploy_host}"
 CREDENTIALS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
 COURSE_DISCOVERY_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"
 
-COURSE_DISCOVERY_OAUTH_URL_ROOT: "https://${deploy_host}"
-COURSE_DISCOVERY_URL_ROOT: "https://course-discovery-${deploy_host}"
-COURSE_DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
-=======
 DISCOVERY_OAUTH_URL_ROOT: "https://${deploy_host}"
 DISCOVERY_URL_ROOT: "https://discovery-${deploy_host}"
 DISCOVERY_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
->>>>>>> 5f930fc... modified the name inside all playbooks
 
 EOF
 fi
@@ -318,11 +312,8 @@ EOF
 fi
 
 declare -A deploy
-<<<<<<< HEAD
-roles="edxapp forum ecommerce programs credentials course_discovery notifier xqueue xserver certs demo testcourses"
-=======
-roles="edxapp forum ecommerce programs discovery notifier xqueue xserver certs demo testcourses"
->>>>>>> 5f930fc... modified the name inside all playbooks
+roles="edxapp forum ecommerce programs credentials discovery notifier xqueue xserver certs demo testcourses"
+
 for role in $roles; do
     deploy[$role]=${!role}
 done