From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/15-visible/SetHydroVisualVisibleDlg.resx |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorDlg.resx b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/15-visible/SetHydroVisualVisibleDlg.resx
similarity index 100%
copy from WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorDlg.resx
copy to WinFrmUI/Yw.WinFrmUI.Hydro.Core/15-visible/SetHydroVisualVisibleDlg.resx

--
Gitblit v1.9.3