提交代码

2025-04-19 13:57:19 +08:00 · 2025-04-19 13:57:19 +08:00 · b3a2fd506e
commit b3a2fd506e
parent 40924e921f
1 changed files with 0 additions and 5 deletions
--- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
+++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
@ -26,11 +26,6 @@ using System.Diagnostics;
 using JiShe.CollectBus.IoTDB.Context;
 using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.IoTDB.Options;
-<<<<<<< HEAD
-using JiShe.CollectBus.Kafka.Internal;
-=======
-using JiShe.CollectBus.Common.Extensions;
->>>>>>> fe51402b1f105dc536f08ec2249d4ab13fa8f172

 namespace JiShe.CollectBus.Samples;