Index: MsgDefs.h
===================================================================
diff -u -r3aa4de3a9d3208963ec1190b4a423d4e3eed0a74 -r230b1b3ba4fef6de247dc9ffe01470ddb7ea7776
--- MsgDefs.h	(.../MsgDefs.h)	(revision 3aa4de3a9d3208963ec1190b4a423d4e3eed0a74)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 230b1b3ba4fef6de247dc9ffe01470ddb7ea7776)
@@ -63,8 +63,12 @@
     MSG_ID_STARTING_STOPPING_TREATMENT_CMD = 0x26,                      ///< HD request to DG to move in/out of standby mode due to treatment start/stop.
     MSG_ID_DG_OP_MODE = 0x27,                                           ///< DG broadcast current operating mode.
     MSG_ID_DG_RESERVOIR_DATA = 0x28,                                    ///< DG broadcast reservoir data.
+<<<<<<< Updated upstream
     MSG_ID_DG_SAMPLE_WATER_CMD = 0x29,                                  ///< HD request to DG to allow user to get a water sample.
     MSG_ID_DG_VALVES_STATES = 0x2A,                                     ///< DG broadcast valve states.
+=======
+    MSG_ID_DG_VALVES_STATES = 0x2A,                                     ///< DG broadcast valves states.
+>>>>>>> Stashed changes
 
     // service/test CAN messages