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