Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf)
@@ -48,10 +48,7 @@
     BOOL startHeater;                       ///< Flag indicates start or stop heater
 } TRIMMER_HEATER_CMD_T;
 
-<<<<<<< HEAD
 
-=======
->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 // ********** Public function prototypes **********
 
 void initHeaters( void );