From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/Properties/DataSources/HStation.WinFrmUI.Organize.MenuViewModel.datasource | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/Properties/DataSources/HStation.WinFrmUI.Auth.MenuViewModel.datasource b/WinFrmUI/HStation.WinFrmUI.Organize.Core/Properties/DataSources/HStation.WinFrmUI.Organize.MenuViewModel.datasource
similarity index 72%
rename from WinFrmUI/HStation.WinFrmUI.Auth.Core/Properties/DataSources/HStation.WinFrmUI.Auth.MenuViewModel.datasource
rename to WinFrmUI/HStation.WinFrmUI.Organize.Core/Properties/DataSources/HStation.WinFrmUI.Organize.MenuViewModel.datasource
index 05e36d4..8f049ac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/Properties/DataSources/HStation.WinFrmUI.Auth.MenuViewModel.datasource
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/Properties/DataSources/HStation.WinFrmUI.Organize.MenuViewModel.datasource
@@ -1,10 +1,10 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<!--
- This file is automatically generated by Visual Studio. It is
- used to store generic object data source configuration information.
- Renaming the file extension or editing the content of this file may
+ This file is automatically generated by Visual Studio. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="MenuViewModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>HStation.WinFrmUI.Auth.MenuViewModel, HStation.WinFrmUI.Auth.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>HStation.WinFrmUI.Organize.MenuViewModel, HStation.WinFrmUI.Organize.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
--
Gitblit v1.9.3