Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r6b870cd0699bb3ee22b93981d51373a6c2d56162 -r97e24856b80f612b2556fb9a599e40659710822a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6b870cd0699bb3ee22b93981d51373a6c2d56162)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 97e24856b80f612b2556fb9a599e40659710822a)
@@ -537,7 +537,11 @@
  * active.
  * @details Inputs: alarmStatus
  * @details Outputs: none
+<<<<<<< HEAD
  * @return TRUE if any alarm is active, FALSE if not
+=======
+ * @return TRUE if given alarm is active, FALSE if not
+>>>>>>> DEN-7091-pre-treatment-mode
  *************************************************************************/
 BOOL isAnyAlarmActive( void )
 {