cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Removed merge conflict header
This commit is contained in:
Michael DeHaan 2013-06-18 17:08:59 -07:00
commit 273f37b394
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/network/get_url
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