Index: firmware/App/HDCommon.h
===================================================================
diff -u -r641b9ffafdde1a8e75901a0f119d79b4e6f55602 -rfcc3481d656de6bbd603b75fc65e2ce6668706f6
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 641b9ffafdde1a8e75901a0f119d79b4e6f55602)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision fcc3481d656de6bbd603b75fc65e2ce6668706f6)
@@ -8,8 +8,12 @@
 * @file    HDCommon.h
 *
 * @author  (last)      Dara Navaei
-<<<<<<< HEAD
-* @date    (last)      21-Mar-2024
+* @date    (last)      14-Nov-2024
+*
+* @author  (original)  Sean
+* @date    (original)  27-Feb-2020
+*
+***************************************************************************/
 =======
 * @date    (last)      02-Nov-2024
 >>>>>>> staging