Removed unused packages

DFE-Digital · Apr 15, 2024 · 0f6c319 · 0f6c319
1 parent 390c7b9
commit 0f6c319
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Dfe.Academies.External.Web/Dfe.Academies.External.Web.csproj b/Dfe.Academies.External.Web/Dfe.Academies.External.Web.csproj
@@ -18,10 +18,8 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.3" />
     <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
-    <PackageReference Include="Azure.Identity" Version="1.10.4" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Azure.Identity" Version="1.11.0" />
     <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
     <PackageReference Include="Dfe.Academisation.CorrelationIdMiddleware" Version="2.0.2" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />

diff --git a/terraform/container-apps-hosting.tf b/terraform/container-apps-hosting.tf
@@ -1,9 +1,5 @@
 module "azure_container_apps_hosting" {
-<<<<<<< HEAD
   source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.6.1"
-=======
-  source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.6.0"
->>>>>>> ef7e4d29 (Deploy a File Share and use it as a local path for data protection)
 
   environment    = local.environment
   project_name   = local.project_name