Update Advanced-Usage.rest

HewlettPackard · May 6, 2022 · c9ccde9 · c9ccde9
1 parent bb55ba3
commit c9ccde9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/Advanced-Usage.rest b/docs/Advanced-Usage.rest
@@ -143,7 +143,6 @@ The **body** property shows what body (if any) was passed along with the request
 >>> response.request.body
 '{"AssetTag": "new tag"}'
 
-<<<<<<< HEAD
 Certificate Based Authentication (HPE iLO Supported Authentication Only)
 ========================================================================
 
@@ -174,8 +173,6 @@ General steps to create the necessary steps include:
 #. Generate user certificate.
 #. Add user certificate mappings to iLO
 
-=======
->>>>>>> parent of 6298e23... Updates to Certificate Based Authentication Login and Docs:
 Multi-part Form Data
 ====================