From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001 From: yangyin <1850366751@qq.com> Date: 星期一, 12 八月 2024 09:18:34 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.resx | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserForm.resx b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.resx similarity index 100% rename from WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserForm.resx rename to WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.resx -- Gitblit v1.9.3