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