diff --git a/check_smart/check_smart.cpp b/check_smart/check_smart.cpp index 56f6d03..985f66a 100644 --- a/check_smart/check_smart.cpp +++ b/check_smart/check_smart.cpp @@ -198,14 +198,6 @@ void set_timeout(unsigned int sec) memset (&sa, 0, sizeof (sa)); sa.sa_handler = &timer_handler; sigaction (SIGVTALRM, &sa, 0); -<<<<<<< HEAD -<<<<<<< HEAD -======= - ->>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f -======= - ->>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f } int main(int argc, char **argv)