resolve conflict

Author: AlessiaYChen

services/net/auto-clipper/AutoClipperService.cs

@@ -66,4 +66,3 @@ protected override IServiceCollection ConfigureServices(IServiceCollection servi
     }
     #endregion
 }
-

services/net/auto-clipper/Azure/AzureSpeechTranscriptionService.cs

@@ -9,6 +9,9 @@
 using System.Xml;
 using Azure.Storage.Blobs;
 using Azure.Storage.Sas;
+using System.Globalization;
+using Microsoft.CognitiveServices.Speech;
+using Microsoft.CognitiveServices.Speech.Audio;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using TNO.Services.AutoClipper.Config;

services/net/auto-clipper/Config/AutoClipperOptions.cs

@@ -24,7 +24,6 @@ public class AutoClipperOptions : ServiceOptions
     public int AzureSpeechMaxRetries { get; set; } = 3;
     public int AzureSpeechRetryDelaySeconds { get; set; } = 5;
 
-
     public string LlmApiUrl { get; set; } = "";
     public string LlmApiKey { get; set; } = "";
     public string LlmModel { get; set; } = "";

services/net/auto-clipper/Config/Stations/CKNW.yml

@@ -83,4 +83,4 @@ heuristics:
     - pattern: "(?i)weather update"
       weight: 0.55
       category: Weather
-      note: Weather hits are their own segments
+      note: Weather hits are their own segments

services/net/auto-clipper/TNO.Services.AutoClipper.csproj

@@ -41,4 +41,3 @@
   </ItemGroup>
 
 </Project>
-