From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningForm.cs | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningForm.cs b/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningForm.cs
index 0676820..9ee8238 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningForm.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/Close/CloseWarningForm.cs
@@ -1,10 +1,4 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Windows.Forms;
namespace HStation.Desktop
@@ -14,12 +8,12 @@
public CloseWarningForm()
{
InitializeComponent();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
}
private void CloseWarningForm_Load(object sender, EventArgs e)
{
-
+
}
public CloseStatus CloseStatus
--
Gitblit v1.9.3