Removed merge conflict header

2013-06-18 15:01:01 -06:00 · 2013-06-18 15:01:01 -06:00 · bb4de94937
commit bb4de94937
parent a94e404a97
1 changed files with 0 additions and 1 deletions
--- a/library/network/get_url
+++ b/library/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