From d66f9574208e510a44a1d3c9f86f19ef0002691f Mon Sep 17 00:00:00 2001
From: CJY <everymomentisu@gmail.com>
Date: Fri, 18 Jul 2025 18:20:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 INT63DC_6CH/Forms/FormSystemSetting.Designer.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
index 91804f9..6bd3cb4 100644
--- a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
+++ b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
@@ -1636,11 +1636,8 @@
         private SmartX.SmartLabel labelStaticDischargeStopperRunTime;
         private SmartX.SmartLabel labelDischargeStopperDelayTime;
         private SmartX.SmartLabel labelStaticDischargeStopperDelayTime;
-<<<<<<< HEAD
         private SmartX.SmartLabel smartLabel3;
         private SmartX.SmartLabel smartLabel2;
-=======
         private SmartX.SmartLabel labelTimeroutCount;
->>>>>>> e960ad66b5a9fb985d32b16060dfeab070187c27
     }
 }
\ No newline at end of file