no message

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -2556,18 +2556,14 @@ namespace VehicleControlSystem.ControlLayer
         {
             this.BatteryIsConnect = false;
             logger.E("BMS - Disconnected");
-            //TODO : 이후에 주석 제거 BMS Disconnect Debugging 필요
-            //this.OccurVehicleAlarm(32);
+
+            this.OccurVehicleAlarm(32);
         }
 
         private void BMUManager_OnConnect(string obj)
         {
             this.BatteryIsConnect = true;
-<<<<<<< HEAD
             logger.I("BMS - Connected");
-            //ReqCurrentPos();
-=======
->>>>>>> d112918ef7906aefa0b5a6e755f6d51f74f84692
         }
 
         private void BMUManager_OnFirstColtd(List<ReceivedData> obj)