Merge pull request #606 from Green-Software-Foundation/feature/main-merge-conflicts-1.6.1

danuw · web-flow · commit a9412acd6f82 · 2025-01-20T10:12:51.000Z
main merge conflicts 1.6.1 to ensure only dev is ahead of main
diff --git a/src/CarbonAware.WebApi/src/Program.cs b/src/CarbonAware.WebApi/src/Program.cs
@@ -13,7 +13,6 @@
 CarbonAwareVariablesConfiguration config = new();
 builder.Configuration.GetSection(CarbonAwareVariablesConfiguration.Key).Bind(config);
 
-
 // Add services to the container.
 builder.Services.AddControllers(options =>
 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`CarbonAwareVariablesConfiguration config = new();`
`14`	`14`	`builder.Configuration.GetSection(CarbonAwareVariablesConfiguration.Key).Bind(config);`
`15`	`15`
`16`		`-`
`17`	`16`	`// Add services to the container.`
`18`	`17`	`builder.Services.AddControllers(options =>`
`19`	`18`	`{`