edx-west carnegie/cme roles: resolve conflicts

playbooks/edx-west/carnegie-prod-app.yml

-<<<<<<< HEAD
-- hosts: ~tag_Name_app(10|20)_carn
-=======
 # This uses variable expansion so you can select machine(s) from the command line
 # using the -e flag.  See README for instructions on how to use.
 - hosts: ~tag_Name_{{machine}}_carn
   pre_tasks:
   - fail: msg="This playbook only runnable on 'app' machines"
     when: "'app' not in machine"
->>>>>>> ddd57c4... validate machine var, remove migrate_db prompt
   sudo: True
   vars:
     secure_dir: '../../../configuration-secure/ansible'

playbooks/edx-west/carnegie-prod-worker.yml

-<<<<<<< HEAD
-# this gets all running prod webservers
-- hosts: tag_environment_prod_carn:&tag_function_util
-# or we can get subsets of them by name
-#- hosts: ~tag_Name_util(10)_carn
-=======
 - name: Basic util setup on carnegie workers
   # This uses variable expansion so you can select machine(s) from the command line
   # using the -e flag.  See README for instructions on how to use.
@@ -11,7 +5,6 @@
   pre_tasks:
   - fail: msg="This playbook only runnable on 'util' machines"
     when: "'util' not in machine"
->>>>>>> ddd57c4... validate machine var, remove migrate_db prompt
   sudo: True
   gather_facts: True
   vars:

playbooks/edx-west/cme-prod-app.yml

@@ -9,20 +9,12 @@
 #      - apt: pkg=libzmq-dev,python-zmq state=present
 #      - action: fireball
 
-<<<<<<< HEAD
-
-# this gets all running prod webservers
-#- hosts: tag_environment_prod:&tag_function_webserver
-# or we can get subsets of them by name
-- hosts: ~tag_Name_app(10|20)_cme
-=======
 # This uses variable expansion so you can select machine(s) from the command line
 # using the -e flag.  See README for instructions on how to use.
 - hosts: ~tag_Name_{{machine}}_cme
   pre_tasks:
   - fail: msg="This playbook only runnable on 'app' machines"
     when: "'app' not in machine"
->>>>>>> ddd57c4... validate machine var, remove migrate_db prompt
   sudo: True
   vars:
     secure_dir: '../../../edx-secret/ansible'

playbooks/edx-west/cme-prod-worker.yml

-<<<<<<< HEAD
-# this gets all running prod webservers
-- hosts: tag_environment_prod_cme:&tag_function_util
-# or we can get subsets of them by name
-#- hosts: ~tag_Name_util(10)_cme
-=======
 - name: Basic util setup on cme hosts
   # This uses variable expansion so you can select machine(s) from the command line
   # using the -e flag.  See README for instructions on how to use.
@@ -11,7 +5,6 @@
   pre_tasks:
   - fail: msg="This playbook only runnable on 'util' machines"
     when: "'util' not in machine"
->>>>>>> ddd57c4... validate machine var, remove migrate_db prompt
   sudo: True
   vars:
     secure_dir: '../../../edx-secret/ansible'