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

Removed merge conflict header
2013-06-18 17:08:59 -07:00 · 2013-06-18 17:08:59 -07:00 · 9cdb513751
commit 9cdb513751
parent 7a5b794243 c96e6c0d1d
1 changed files with 0 additions and 1 deletions
--- a/network/get_url
+++ b/network/get_url
@ -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