Index: results/cppcheck.log
===================================================================
diff -u -rbd37de9f5836bbb46d90ee639cc60e6375614f1b -r1a685471524555a374854c0c9ec8e208e71fe2df
--- results/cppcheck.log	(.../cppcheck.log)	(revision bd37de9f5836bbb46d90ee639cc60e6375614f1b)
+++ results/cppcheck.log	(.../cppcheck.log)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -4,7 +4,6 @@
 2/46 files checked 4% done
 Checking hdfirmware/firmware/App/Controllers/BloodFlow.c ...
 Checking hdfirmware/firmware/App/Controllers/BloodFlow.c: BREADBOARD_TARGET...
-Checking hdfirmware/firmware/App/Controllers/BloodFlow.c: FLOW_DEBUG...
 Checking hdfirmware/firmware/App/Controllers/BloodFlow.c: RAW_FLOW_SENSOR_DATA...
 3/46 files checked 6% done
 Checking hdfirmware/firmware/App/Controllers/Buttons.c ...
@@ -52,19 +51,44 @@
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c ...
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: DISABLE_UI_TREATMENT_WORKFLOW...
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: RM46_EVAL_BOARD_TARGET...
+<<<<<<< HEAD
+16/45 files checked 34% done
+=======
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: RUN_PUMPS_OPEN_LOOP...
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: UF_TEST_ENABLED...
 17/46 files checked 36% done
+>>>>>>> master
 Checking hdfirmware/firmware/App/Modes/ModePreTreat.c ...
 Checking hdfirmware/firmware/App/Modes/ModePreTreat.c: DISABLE_UI_TREATMENT_WORKFLOW...
 Checking hdfirmware/firmware/App/Modes/ModePreTreat.c: RM46_EVAL_BOARD_TARGET...
+<<<<<<< HEAD
+17/45 files checked 37% done
+=======
 18/46 files checked 38% done
+>>>>>>> master
 Checking hdfirmware/firmware/App/Modes/ModeService.c ...
 19/46 files checked 40% done
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c ...
+<<<<<<< HEAD
+Checking hdfirmware/firmware/App/Modes/ModeStandby.c: DISABLE_UI_TREATMENT_WORKFLOW...
+=======
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: DISABLE_UI_TREATMENT_WORKFLOW;UF_TEST_WITH_DG...
+>>>>>>> master
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: EMC_TEST_BUILD...
+Checking hdfirmware/firmware/App/Modes/ModeStandby.c: EMC_TEST_BUILD;RUN_WITHOUT_DG...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: RM46_EVAL_BOARD_TARGET...
+<<<<<<< HEAD
+Checking hdfirmware/firmware/App/Modes/ModeStandby.c: RUN_WITHOUT_DG...
+19/45 files checked 41% done
+Checking hdfirmware/firmware/App/Modes/ModeTreatment.c ...
+Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: DISABLE_UI_TREATMENT_WORKFLOW...
+Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: RM46_EVAL_BOARD_TARGET...
+20/45 files checked 43% done
+Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c ...
+Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: DISABLE_UI_TREATMENT_WORKFLOW...
+Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: RM46_EVAL_BOARD_TARGET...
+21/45 files checked 45% done
+=======
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: UF_TEST_WITH_DG...
 20/46 files checked 42% done
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c ...
@@ -77,6 +101,7 @@
 Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: UF_TEST_ENABLED...
 22/46 files checked 47% done
+>>>>>>> master
 Checking hdfirmware/firmware/App/Modes/OperationModes.c ...
 23/46 files checked 49% done
 Checking hdfirmware/firmware/App/Modes/TreatmentStop.c ...