Index: MsgDefs.h
===================================================================
diff -u -r88ef902b047992b779340ae35986b26bd0b8b94e -rb22bcd86fc6d6cb1f3e2c28efaf47fdc4a18dcf2
--- MsgDefs.h	(.../MsgDefs.h)	(revision 88ef902b047992b779340ae35986b26bd0b8b94e)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision b22bcd86fc6d6cb1f3e2c28efaf47fdc4a18dcf2)
@@ -8,8 +8,13 @@
 *
 * @file    MsgDefs.h
 *
+<<<<<<< HEAD
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Mar-2022
+=======
 * @author  (last)      Dara Navaei
 * @date    (last)      31-Mar-2022
+>>>>>>> staging
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020