From 781d49dfb1a218d0c5adb050eebf64f312919515 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 9 Jun 2017 14:19:31 -0400
Subject: [PATCH] fix merge

---
 src/zm_zone.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_zone.h b/src/zm_zone.h
index bfd39e9aa..9ac8371f0 100644
--- a/src/zm_zone.h
+++ b/src/zm_zone.h
@@ -77,6 +77,7 @@ protected:
 
   // Outputs/Statistics
   bool      alarmed;
+  bool      was_alarmed;
   int        pixel_diff;
   unsigned int      alarm_pixels;
   int        alarm_filter_pixels;