Index: firmware/App/HDCommon.h
===================================================================
diff -u -r642c456b7e878c12efc6fa52c3daa02b5d8356ba -re15d3e8255a0740b262f95ee0fee6c99d60b05a0
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 642c456b7e878c12efc6fa52c3daa02b5d8356ba)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e15d3e8255a0740b262f95ee0fee6c99d60b05a0)
@@ -14,14 +14,6 @@
 * @date    (original)  27-Feb-2020
 *
 ***************************************************************************/
-=======
-* @date    (last)      02-Nov-2024
->>>>>>> staging
-*
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
-*
-***************************************************************************/
 
 #ifndef __HD_COMMON_H__
 #define __HD_COMMON_H__