충돌수정
							parent
							
								
									90b9d69dea
								
							
						
					
					
						commit
						d66f957420
					
				| 
						 | 
				
			
			@ -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
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
		Reference in New Issue