Commit da7c8f92109b857356ba1c87961ecfac8f539c83
1 parent
f70381e2
Fixed merge fail
Showing
1 changed file
with
0 additions
and
8 deletions
check_smart/check_smart.cpp
| @@ -198,14 +198,6 @@ void set_timeout(unsigned int sec) | @@ -198,14 +198,6 @@ void set_timeout(unsigned int sec) | ||
| 198 | memset (&sa, 0, sizeof (sa)); | 198 | memset (&sa, 0, sizeof (sa)); |
| 199 | sa.sa_handler = &timer_handler; | 199 | sa.sa_handler = &timer_handler; |
| 200 | sigaction (SIGVTALRM, &sa, 0); | 200 | sigaction (SIGVTALRM, &sa, 0); |
| 201 | -<<<<<<< HEAD | ||
| 202 | -<<<<<<< HEAD | ||
| 203 | -======= | ||
| 204 | - | ||
| 205 | ->>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f | ||
| 206 | -======= | ||
| 207 | - | ||
| 208 | ->>>>>>> f3a48aed56edc3f5053f68421dbc764d5930797f | ||
| 209 | } | 201 | } |
| 210 | 202 | ||
| 211 | int main(int argc, char **argv) | 203 | int main(int argc, char **argv) |