fix merges

This commit is contained in:
Isaac Connor
2018-05-12 19:44:20 -04:00
parent c3053a2f8a
commit d3c95ea144
3 changed files with 1 additions and 4 deletions

View File

@@ -267,7 +267,6 @@ int main(int argc, char *argv[]) {
AnalysisThread **analysis_threads = new AnalysisThread *[n_monitors];
int *capture_delays = new int[n_monitors];
int *alarm_capture_delays = new int[n_monitors];
int *next_delays = new int[n_monitors];
struct timeval * last_capture_times = new struct timeval[n_monitors];
for ( int i = 0; i < n_monitors; i++ ) {
last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;