1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #3255 from jlund/sha256-example-cleanup

Removed merge conflict header
This commit is contained in:
Michael DeHaan 2013-06-18 17:08:59 -07:00
commit 273f37b394

View file

@ -89,7 +89,6 @@ author: Jan-Piet Mens
''' '''
EXAMPLES=''' EXAMPLES='''
<<<<<<< HEAD
- name: download foo.conf - name: download foo.conf
get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf mode=0440 get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf mode=0440