Advanced-Usage.rest contains conflict markers

HewlettPackard / python-ilorest-library

Python library for interacting with devices which support a Redfish Service

Apache License 2.0

181 stars 89 forks source link

Closed dimkup closed 2 years ago

dimkup commented 2 years ago

Lines 146, 178 of Advanced-Usage.rest contain <<<<<<< and >>>>>>> which prevents some version control systems from working correctly..

kaviyajm commented 2 years ago

Hi, we working on updating the Advanced-Usage.rest, will keep you posted once changes are done

rajeevkallur commented 2 years ago

Fixed