SJ84
/
INT63DC_6CH
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

충돌수정

main
CJY 2025-07-18 18:20:38 +09:00
parent 90b9d69dea
commit d66f957420
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INT63DC_6CH/Forms/FormSystemSetting.Designer.cs generated
View File

@ -1636,11 +1636,8 @@
private SmartX.SmartLabel labelStaticDischargeStopperRunTime; private SmartX.SmartLabel labelStaticDischargeStopperRunTime;
private SmartX.SmartLabel labelDischargeStopperDelayTime; private SmartX.SmartLabel labelDischargeStopperDelayTime;
private SmartX.SmartLabel labelStaticDischargeStopperDelayTime; private SmartX.SmartLabel labelStaticDischargeStopperDelayTime;
<<<<<<< HEAD
private SmartX.SmartLabel smartLabel3; private SmartX.SmartLabel smartLabel3;
private SmartX.SmartLabel smartLabel2; private SmartX.SmartLabel smartLabel2;
=======
private SmartX.SmartLabel labelTimeroutCount; private SmartX.SmartLabel labelTimeroutCount;
>>>>>>> e960ad66b5a9fb985d32b16060dfeab070187c27
} }
} }