From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/ClipboardCurveTextUIHelper.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/Clipboard/ClipboardCurveTextUIHelper.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/ClipboardCurveTextUIHelper.cs
similarity index 98%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/Clipboard/ClipboardCurveTextUIHelper.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/ClipboardCurveTextUIHelper.cs
index a5f95dd..96dda80 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/Clipboard/ClipboardCurveTextUIHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/99-temp/Clipboard/ClipboardCurveTextUIHelper.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Windows.Forms;
-namespace XPump.WinFrmUI
+namespace Yw.WinFrmUI.Phart
{
/// <summary>
/// 鏇茬嚎UI鍓垏鏉胯緟鍔╃被
--
Gitblit v1.9.3