From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决
---
Hydro.ClientTool/Form1.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Hydro.ClientTool/Form1.cs b/Hydro.ClientTool/Form1.cs
index bf2cebd..6ce52b8 100644
--- a/Hydro.ClientTool/Form1.cs
+++ b/Hydro.ClientTool/Form1.cs
@@ -7,7 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Hydro.MapUI;
+//using Hydro.MapUI;
namespace Hydro.ClientTool
{
@@ -25,7 +25,7 @@
private void button1_Click(object sender, EventArgs e)
{
- MapViewer viwer = new MapViewer(true);
+ //MapViewer viwer = new MapViewer(true);
//viwer.Dock = DockStyle.Fill;
//viwer.Name = "MapViewer";
//this.Controls.Add(viwer);
--
Gitblit v1.9.3