From 1c7422e809cf63a13d9115b70dc58d52e44358f2 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Thu, 3 Oct 2019 17:19:55 -0700 Subject: [PATCH] Fix bad GitHub merge --- .../src/CertificateClient.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs index b73c06e78c10..88657d0b52df 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs @@ -1448,7 +1448,7 @@ public virtual Response MergeCertificate(CertificateMerge { Response certificate = _pipeline.SendRequest(RequestMethod.Post, () => new CertificateWithPolicy(), cancellationToken, CertificatesPath, certificateMergeOptions.Name, "/pending/merge"); - return Response.FromValue(certificate.GetRawResponse(), certificate.Value); + return Response.FromValue(certificate.Value, certificate.GetRawResponse()); } catch (Exception e) { @@ -1475,7 +1475,7 @@ public virtual async Task> MergeCertificateAsync { Response certificate = await _pipeline.SendRequestAsync(RequestMethod.Post, () => new CertificateWithPolicy(), cancellationToken, CertificatesPath, certificateMergeOptions.Name, "/pending/merge").ConfigureAwait(false); - return Response.FromValue(certificate.GetRawResponse(), certificate.Value); + return Response.FromValue(certificate.Value, certificate.GetRawResponse()); } catch (Exception e) {