Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -ra26a94535a8931d2a86487c48d55e4549934bfe8 -rf8b2a4fe19bf60994920d7e310069a70fdbaa60c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision a26a94535a8931d2a86487c48d55e4549934bfe8)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f8b2a4fe19bf60994920d7e310069a70fdbaa60c)
@@ -989,7 +989,10 @@
         data.internalTHDORTD           = getTemperatureValue( TEMPSENSORS_INTERNAL_TRO_RTD );
         data.internalTDIRTD            = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD );
         data.internalCondSnsrTemp      = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR );
+<<<<<<< HEAD
+=======
 
+>>>>>>> a26a94535a8931d2a86487c48d55e4549934bfe8
         broadcastData( MSG_ID_DG_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
         dataPublicationTimerCounter = 0;
     }