Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r044928ad00c678ecb84940ab5fbf978ee2bcab47 -ra15cd6e3226f4b434e49c00bd7b9a3975eac92a0
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 044928ad00c678ecb84940ab5fbf978ee2bcab47)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a15cd6e3226f4b434e49c00bd7b9a3975eac92a0)
@@ -408,12 +408,10 @@
             BOOL isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlow > targetFlow ) ? TRUE : FALSE );
             BOOL isFlowOutOfLowerRange = ( isFlowOutOfRange && ( currentFlow < targetFlow ) ? TRUE : FALSE );
 
-<<<<<<< Updated upstream
+
 //            printf("%s- isFlowOutOfUpperRange: %d, %f, %f\n", __func__, isFlowOutOfUpperRange, currentFlow, targetFlow);      // wjb
-=======
-;;            printf("%s- isFlowOutOfUpperRange: %d, %f, %f\n", __func__, isFlowOutOfUpperRange, currentFlow, targetFlow);      // wjb
->>>>>>> Stashed changes
 
+
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
         }