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.Basic.Core/02-SysPropManage/SelectCorprationListCtrl.resx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SelectCorprationListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SelectCorprationListCtrl.resx
index a1f8566..9feae86 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SelectCorprationListCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SelectCorprationListCtrl.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
--
Gitblit v1.9.3