From c34f05eace8f6aefe1cdc2f77f5bfa17bd25a260 Mon Sep 17 00:00:00 2001
From: qinjie <qinjie@163.com>
Date: 星期二, 19 十二月 2023 15:46:24 +0800
Subject: [PATCH] 冲突解决
---
Hydro.MapBase/Map/map_old.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Hydro.MapBase/Map/map_old.cs b/Hydro.MapBase/Map/map_old.cs
index 9dee954..e35195c 100644
--- a/Hydro.MapBase/Map/map_old.cs
+++ b/Hydro.MapBase/Map/map_old.cs
@@ -1,6 +1,6 @@
-锘縰sing CloudWaterNetwork.Magnifier;
-using CommonBase;
-using ConfigApp;
+锘�//using CloudWaterNetwork.Magnifier;
+using Hydro.CommonBase;
+//using ConfigApp;
//using DevExpress.Diagram.Core.Layout;
//using DevExpress.DirectX.NativeInterop.Direct2D;
//using DevExpress.Utils.Extensions;
@@ -37,7 +37,7 @@
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
using Cursor = System.Windows.Forms.Cursor;
-namespace CloudWaterNetwork
+namespace Hydro.MapUI
{
public partial class MapViewer_Old : UserControl
{
--
Gitblit v1.9.3