From e33a8aa1dd7b9d0a29cc38a38f40d0308aa9dcf4 Mon Sep 17 00:00:00 2001
From: C3032 <C3032@BC3032>
Date: 星期五, 09 一月 2026 10:08:09 +0800
Subject: [PATCH] 冲突解决

---
 LB_VisionProcesses/Cameras/BaseCamera.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/LB_VisionProcesses/Cameras/BaseCamera.cs b/LB_VisionProcesses/Cameras/BaseCamera.cs
index 215aff7..a5b371a 100644
--- a/LB_VisionProcesses/Cameras/BaseCamera.cs
+++ b/LB_VisionProcesses/Cameras/BaseCamera.cs
@@ -186,7 +186,7 @@
 
         #region  protected abstract
         /// <summary>
-        /// 寮�濮嬮噰鍥撅紙榛樿杩炵画閲囬泦锛�
+        /// 寮�濮嬮噰鍥撅紙榛樿鍗曟閲囬泦锛�
         /// </summary>
         /// <returns></returns>
         public abstract bool StartGrabbing();

--
Gitblit v1.9.3