From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 13e261d..6a3bd4e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -251,8 +251,6 @@
this.LoadingDeviceListView(vv, lists);
}
-
-
/// <summary>
/// 鏄剧ず璁惧鐨刅iew
/// </summary>
--
Gitblit v1.8.0