From b3a2fd506ed904bc667d10f6e30fe63095067b40 Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Sat, 19 Apr 2025 13:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiShe.CollectBus.Application/Samples/SampleAppService.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
index e5a7b81..61ba9ce 100644
--- 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;