remove merge text
This commit is contained in:
parent
8654f76936
commit
eb0372ded4
|
@ -214,15 +214,10 @@
|
||||||
tags: always
|
tags: always
|
||||||
#----------------------------------/Check ENV----------------------------------
|
#----------------------------------/Check ENV----------------------------------
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- name: Restart the container if fileChanged is defined
|
- name: Restart the container if fileChanged is defined
|
||||||
set_fact: item.value.restart='yes'
|
set_fact: item.value.restart='yes'
|
||||||
when: fileChanged is defined
|
when: fileChanged is defined
|
||||||
|
|
||||||
=======
|
|
||||||
|
|
||||||
#TODO - If a confile file or volume is changed, trestart the container
|
|
||||||
>>>>>>> 4f62020d89990a6ff0b6ec67f986f613e77f308f
|
|
||||||
|
|
||||||
- name: "Container {{ container_Name }}"
|
- name: "Container {{ container_Name }}"
|
||||||
become: yes
|
become: yes
|
||||||
|
|
Loading…
Reference in New Issue