Commit 273f37b3 by Michael DeHaan

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

Removed merge conflict header
parents 7193ff5f bb4de949
......@@ -89,7 +89,6 @@ author: Jan-Piet Mens
'''
EXAMPLES='''
<<<<<<< HEAD
- name: download foo.conf
get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf mode=0440
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment