Index: MsgDefs.h
===================================================================
diff -u -r230b1b3ba4fef6de247dc9ffe01470ddb7ea7776 -rf20bf19b2d24e1090c8c1bef28e1266ab94ba9d5
--- MsgDefs.h	(.../MsgDefs.h)	(revision 230b1b3ba4fef6de247dc9ffe01470ddb7ea7776)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f20bf19b2d24e1090c8c1bef28e1266ab94ba9d5)
@@ -63,15 +63,10 @@
     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
-
     MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,                               ///< First HD test message ID.
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,          ///< HD tester log-in.
     MSG_ID_HD_MESSAGE = 0x8001,                                         ///< HD message.   TODO - needed?