Removed merge conflict header

rwstauner · Jun 18, 2013 · bb4de94 · bb4de94
1 parent a94e404
commit bb4de94
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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