From 60228e93be129f18ed78f2b35ed291008a9e8f23 Mon Sep 17 00:00:00 2001
From: spbsoluble <1661003+spbsoluble@users.noreply.github.com>
Date: Thu, 23 Jul 2026 09:50:57 -0700
Subject: [PATCH] fix: resolve merge conflict markers committed in 1.3.3 merge

PR #26 squash-merged release-1.3 commit f4fbf10, which had been
committed with unresolved conflict markers in CHANGELOG.md and
GCPCASClient.cs, leaving main uncompilable (CS8300 x27).

The intended resolution of every conflict block is the release-1.3
side, whose content is byte-identical to the 1.3.3 tag. Restore both
files from the 1.3.3 tag.
---
 CHANGELOG.md                  |  3 ---
 GCPCAS/Client/GCPCASClient.cs | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6dd435..90e8230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,5 @@
-<<<<<<< release-1.3
 - 1.3.3
   - Sync now skips bad/unparseable certificates returned from Google CAS instead of failing the sync.
-=======
->>>>>>> main
 - 1.3.2
   - Fixed Sans Being passed through Extensions Data, Google does not like this.
 - 1.3.1
diff --git a/GCPCAS/Client/GCPCASClient.cs b/GCPCAS/Client/GCPCASClient.cs
index 01320c0..455a733 100644
--- a/GCPCAS/Client/GCPCASClient.cs
+++ b/GCPCAS/Client/GCPCASClient.cs
@@ -271,7 +271,6 @@ public async Task<int> DownloadAllIssuedCertificates(BlockingCollection<AnyCAPlu
                             continue;
                         }
                     }
-<<<<<<< release-1.3
                     AnyCAPluginCertificate pluginCertificate = AnyCAPluginCertificateFromGCPCertificate(certificate);
 
                     // Mirror the subject handling the AnyCA Gateway performs when it builds the
@@ -287,9 +286,6 @@ public async Task<int> DownloadAllIssuedCertificates(BlockingCollection<AnyCAPlu
                     }
 
                     certificatesBuffer.Add(pluginCertificate);
-=======
-                    certificatesBuffer.Add(AnyCAPluginCertificateFromGCPCertificate(certificate));
->>>>>>> main
                     numberOfCertificates++;
                     _logger.LogDebug($"Found Certificate with name {certificate.CertificateName.CertificateId} {this.ToString()}");
                 }
@@ -317,10 +313,7 @@ public async Task<int> DownloadAllIssuedCertificates(BlockingCollection<AnyCAPlu
         {
             certificatesBuffer.CompleteAdding();
             _logger.LogDebug($"Fetched {certificatesBuffer.Count} certificates from GCP over {pageNumber} pages.");
-<<<<<<< release-1.3
             _logger.LogInformation($"[SYNC-DIAG] Handed {numberOfCertificates} certificate(s) to the AnyCA Gateway buffer; skipped {skippedCertificates} certificate(s) with subjects the gateway cannot parse. Review the per-record [SYNC-DIAG]/[SYNC-SKIP] lines above for details.");
-=======
->>>>>>> main
         }
         _logger.MethodExit();
         return numberOfCertificates;
@@ -380,7 +373,6 @@ private AnyCAPluginCertificate AnyCAPluginCertificateFromGCPCertificate(Certific
             status = EndEntityStatus.REVOKED;
             revocationReason = (int)certificate.RevocationDetails.RevocationState;
         }
-<<<<<<< release-1.3
 
         string caRequestId = certificate.CertificateName.CertificateId;
         string pem = certificate.PemCertificate;
@@ -391,8 +383,6 @@ private AnyCAPluginCertificate AnyCAPluginCertificateFromGCPCertificate(Certific
         // compare against what the Gateway stores / returns to Command on the /v2/certificate/search response.
         LogCertificateContentDiagnostics(caRequestId, pem, status, revocationDate, revocationReason);
 
-=======
->>>>>>> main
         _logger.MethodExit();
         return new AnyCAPluginCertificate
         {