Removed merge conflict header

This commit is contained in:
Joshua Lund 2013-06-18 15:01:01 -06:00
parent b1d96bc839
commit c96e6c0d1d

View file

@ -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