Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r97e24856b80f612b2556fb9a599e40659710822a -r565ed0856be2fcf1443e3ec4cb8fe023b2c14db4
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 97e24856b80f612b2556fb9a599e40659710822a)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 565ed0856be2fcf1443e3ec4cb8fe023b2c14db4)
@@ -537,11 +537,7 @@
  * 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 )
 {