From 833c76cfe3e33a8225051405623711ffceccff2e Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 19 一月 2026 16:50:21 +0800
Subject: [PATCH] 合并冲突
---
LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs b/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
index 1d9acea..125114c 100644
--- a/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
+++ b/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
@@ -1,4 +1,3 @@
-锘�
using LB_VisionControl;
using LB_VisionProcesses.Cameras;
using OpenCvSharp.Flann;
@@ -177,4 +176,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3