From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
index 7eb1619..01c14d3 100644
--- a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
+++ b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
@@ -42,7 +42,7 @@
map.BackColor = System.Drawing.Color.Transparent;
- map.Dock = System.Windows.Forms.DockStyle.Fill;
+ //map.Dock = System.Windows.Forms.DockStyle.Fill;
map.Location = new System.Drawing.Point(0, 0);
--
Gitblit v1.9.3