fix merge

This commit is contained in:
Isaac Connor 2017-06-09 14:19:31 -04:00
parent 7e3b101d7f
commit 781d49dfb1
1 changed files with 1 additions and 0 deletions

View File

@ -77,6 +77,7 @@ protected:
// Outputs/Statistics // Outputs/Statistics
bool alarmed; bool alarmed;
bool was_alarmed;
int pixel_diff; int pixel_diff;
unsigned int alarm_pixels; unsigned int alarm_pixels;
int alarm_filter_pixels; int alarm_filter_pixels;