Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c -r8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 8b9dd16bff3c3a7debdbd4c1f0c06759fe97d0bf)
@@ -59,10 +59,7 @@
     NUM_OF_TEMPERATURE_SENSORS                  ///< Number of temperature sensors
 } TEMPERATURE_SENSORS_T;
 
-<<<<<<< HEAD
 
-=======
->>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
 // ********** public function prototypes **********
 
 void initTemperatureSensors( void );