From bb4de94937ad7d9a16cbac7707a5c0781101a380 Mon Sep 17 00:00:00 2001
From: Joshua Lund <josh@joshlund.com>
Date: Tue, 18 Jun 2013 15:01:01 -0600
Subject: [PATCH] Removed merge conflict header

---
 library/network/get_url | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/network/get_url b/library/network/get_url
index 7cc1c5227e..53b0726147 100644
--- 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