From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.resx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.resx
index af32865..8b2ff64 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.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