Removed merge conflict header

11 years ago · c96e6c0d1d
parent b1d96bc839
commit 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