Imanol-Mikel Barba Sabariego / nagios-plugins · Commits

Commit f70381e257eeab5759451dcbb7e0e28ac8346066

Authored by Imanol-Mikel Barba Sabariego
2 parents 854a4fca f3a48aed

Merge branch 'master' of https://gitlab.imanolbarba.net/imanol/nagios-plugins

Inline Side-by-side
Showing 1 changed file with 4 additions and 0 deletions
check_smart/check_smart.cpp
  View file @f70381e
@@ -199,6 +199,10 @@ void set_timeout(unsigned int sec) @@ -199,6 +199,10 @@ void set_timeout(unsigned int sec)
199 sa.sa_handler = &timer_handler; 199 sa.sa_handler = &timer_handler;
200 sigaction (SIGVTALRM, &sa, 0); 200 sigaction (SIGVTALRM, &sa, 0);
201 <<<<<<< HEAD 201 <<<<<<< HEAD
  202 +<<<<<<< HEAD
  203 +=======
  204 +
  205 +>>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f
202 ======= 206 =======
203 207
204 >>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f 208 >>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f