From c96e6c0d1d7f812ff0ed0d9e38ed4c9e3f4d6823 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

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

diff --git a/network/get_url b/network/get_url
index 7cc1c5227ec..53b07261479 100644
--- 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