From e7ebe4f70f31a696423bdf06403532ab4569ef2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2026 13:52:01 +0000 Subject: [PATCH 1/2] CONFIG: Bump ISL.Providers.PDS.Abstractions and ISL.Providers.PDS.FHIR Bumps ISL.Providers.PDS.Abstractions from 1.0.0.8 to 1.0.0.9 Bumps ISL.Providers.PDS.FHIR from 1.0.0.8 to 1.0.0.9 --- updated-dependencies: - dependency-name: ISL.Providers.PDS.Abstractions dependency-version: 1.0.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: ISL.Providers.PDS.FHIR dependency-version: 1.0.0.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj b/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj index 737aef8..722f443 100644 --- a/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj +++ b/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj @@ -59,9 +59,9 @@ - + - + From 97f28b95777aea88cda3cdb510849978542818d7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Jul 2026 22:21:57 +0000 Subject: [PATCH 2/2] Fix remaining merge marker in SDK project --- NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj b/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj index e9ec2cd..a6c5e9f 100644 --- a/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj +++ b/NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj @@ -60,7 +60,6 @@ -<<<<<<< HEAD