From 30bf8a4b8bdab0dd153c24ab5937da7588a500af Mon Sep 17 00:00:00 2001
From: Uggla <uggla@free.fr>
Date: Sat, 13 Feb 2016 21:19:35 +0100
Subject: [PATCH] Remove invalid remaining line after resolving conflict

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index a04f1e1..162a4f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,6 @@ summary = Reference implementation of Redfish standard client.
 description-file =
     README.rst
 author = Redfish dev team
-<<<<<<< HEAD
 author-email = python-redfish@mondorescue.org
 home-page = https://github.com/uggla/python-redfish/tree/devel
 license = Apache-2