merged to main.

Author: RossBugginsNHS

.gitleaksignore

@@ -16,4 +16,7 @@ b1f85a7faf54eaf66074d7a6daa093aefe6b3ebe:sdk/python/pyproject.toml:ipv4:25
 28aa8bcf42e1af50ab2541a345be851b53dd0f00:specification/api/notify-supplier.yml:generic-api-key:115
 93e54b6baa390529aab08d9fd956837f7bb3f30:src/src.sln:ipv4:3
 493e54b6baa390529aab08d9fd956837f7bb3f30:src/src.sln:ipv4:3
+<<<<<<< HEAD
 d8aaf7e033bf78fff491caa148897be266b60f67:src/src.sln:ipv4:3
+=======
+>>>>>>> origin/main

src/server/host/Program.cs

@@ -11,11 +11,18 @@
   builder.Configuration,
   suppliersApiBuilder =>
   {
+<<<<<<< HEAD
     suppliersApiBuilder
       .FromAssemblies()
       .ConfigureOptions(suppliersOptions =>
       {
       });
+=======
+    suppliersApiBuilder.FromAssemblies();
+    suppliersApiBuilder.ConfigureOptions(suppliersOptions =>
+    {
+    });
+>>>>>>> origin/main
   });
 
 var app = builder.Build();

src/server/server.sln

@@ -3,13 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
+<<<<<<< HEAD
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "letter", "letter\letter.csproj", "{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "data", "data\data.csproj", "{919B3975-F504-4A5B-9853-EE8CDA834CF0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "host", "host\host.csproj", "{28799552-4E08-4631-B27E-B2B65195CFFA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "abstractions", "abstractions\abstractions.csproj", "{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}"
+=======
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "abstractions", "abstractions\abstractions.csproj", "{3C2F563D-8CDE-427C-B5C6-83B2C6094942}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "host", "host\host.csproj", "{677DD50B-705B-41EA-9184-BAF6FD3B51AA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "letter", "letter", "{C765FCF7-579D-4518-9027-228A36B5873F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "data", "data\data.csproj", "{87832A02-4849-4969-BCF5-04A1176DBFBD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "letter", "letter\letter.csproj", "{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}"
+>>>>>>> origin/main
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,6 +32,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+<<<<<<< HEAD
 		{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -36,5 +49,31 @@ Global
 		{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.Build.0 = Release|Any CPU
+=======
+		{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Release|Any CPU.Build.0 = Release|Any CPU
+		{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87832A02-4849-4969-BCF5-04A1176DBFBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87832A02-4849-4969-BCF5-04A1176DBFBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87832A02-4849-4969-BCF5-04A1176DBFBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87832A02-4849-4969-BCF5-04A1176DBFBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{050DA337-782A-4CA2-9C6C-35DA30B166FD} = {C765FCF7-579D-4518-9027-228A36B5873F}
+		{AA5F5F27-00B4-4C49-A757-2EF75BD7339E} = {C765FCF7-579D-4518-9027-228A36B5873F}
+>>>>>>> origin/main
 	EndGlobalSection
 EndGlobal