Cleanup the repository based on the result of resolving merge conflicts.

isaacito12 · Jul 31, 2024 · b2cdc59 · b2cdc59
1 parent d01b07b
commit b2cdc59
Show file tree

Hide file tree

Showing 28 changed files with 2,090 additions and 14,135 deletions.
diff --git a/BEV/BEV_system_model.mdl.r2023b b/BEV/BEV_system_model.mdl.r2023b
diff --git a/BEV/Test/TestResults_R2023b.xml b/BEV/Test/TestResults_R2023b.xml
diff --git a/Components/BEVController/Test/BEVController_TestResults_R2023b.xml b/Components/BEVController/Test/BEVController_TestResults_R2023b.xml
diff --git a/Components/BatteryHighVoltage/Harness/BatteryHV_harness_model.mdl.r2023b b/Components/BatteryHighVoltage/Harness/BatteryHV_harness_model.mdl.r2023b
diff --git a/Components/BatteryHighVoltage/Test/BatteryHV_TestResults_R2023b.xml b/Components/BatteryHighVoltage/Test/BatteryHV_TestResults_R2023b.xml
diff --git a/Components/ControllerAndEnvironment/Test/CtrlEnv_TestResults_R2023b.xml b/Components/ControllerAndEnvironment/Test/CtrlEnv_TestResults_R2023b.xml
diff --git a/Components/MotorDriveUnit/Test/MotorDriveUnit_TestResults_R2023b.xml b/Components/MotorDriveUnit/Test/MotorDriveUnit_TestResults_R2023b.xml
diff --git a/Components/Vehicle1D/Test/Vehicle1D_TestResults_R2023b.xml b/Components/Vehicle1D/Test/Vehicle1D_TestResults_R2023b.xml