From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Map.Core/GlobalUsings.cs |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Map.Core/GlobalUsings.cs b/WinFrmUI/Yw.WinFrmUI.Map.Core/GlobalUsings.cs
index aef754d..132e04b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Map.Core/GlobalUsings.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Map.Core/GlobalUsings.cs
@@ -1,3 +1 @@
 锘縢lobal using Yw.WebBrower;
-global using System.ComponentModel.DataAnnotations;
-global using DevExpress.XtraEditors;
\ No newline at end of file

--
Gitblit v1.9.3