From 71ff3ccde064c104db61fa28300b039456c0ba06 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 14 八月 2024 17:18:18 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/00-core/01-xtr-ele/05-annotation/XtrTextAnnotation.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/00-core/01-xtr-ele/05-annotation/XtrTextAnnotation.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/00-core/01-xtr-ele/05-annotation/XtrTextAnnotation.cs
index a1968c8..c3456f1 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/00-core/01-xtr-ele/05-annotation/XtrTextAnnotation.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/00-core/01-xtr-ele/05-annotation/XtrTextAnnotation.cs
@@ -1,4 +1,4 @@
-锘縩amespace Yw.WinFrmUI.Phart.Core
+锘縩amespace Yw.WinFrmUI.Phart
 {
     public class XtrTextAnnotation : XtrBase
     {

--
Gitblit v1.9.3