x/python-redfish
Code Issues Proposed changes

Remove invalid remaining line after resolving conflict

Browse Source
This commit is contained in:
Uggla 2016-02-13 21:19:35 +01:00
parent f25f4fad62
commit 30bf8a4b8b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.cfg
View File

@ -4,7 +4,6 @@ summary = Reference implementation of Redfish standard client.
description-file = description-file =
README.rst README.rst
author = Redfish dev team author = Redfish dev team
<<<<<<< HEAD
author-email = python-redfish@mondorescue.org author-email = python-redfish@mondorescue.org
home-page = https://github.com/uggla/python-redfish/tree/devel home-page = https://github.com/uggla/python-redfish/tree/devel
license = Apache-2 license = Apache-2