diff options
| author | Willam San Filippo <will@micosa.io> | 2015-07-13 18:19:17 -0700 |
|---|---|---|
| committer | Willam San Filippo <will@micosa.io> | 2015-07-13 18:19:17 -0700 |
| commit | 484bb370639a2fecf61da4d40ee5cd99c8aedadf (patch) | |
| tree | 71a33dc20d6331b9b1e72562c97839fd29242e7c /libs/os/src/os_task.c | |
| parent | 7c7dc7b1d501d719d86613f8b2ec571d2c46f531 (diff) | |
Fix incorrect push of merged files
Diffstat (limited to 'libs/os/src/os_task.c')
| -rw-r--r-- | libs/os/src/os_task.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/os/src/os_task.c b/libs/os/src/os_task.c index ff48f959..177153e5 100644 --- a/libs/os/src/os_task.c +++ b/libs/os/src/os_task.c @@ -68,11 +68,7 @@ os_task_init(struct os_task *t, char *name, os_task_func_t func, void *arg, stack_size); /* insert this task into the scheduler list */ -<<<<<<< HEAD rc = os_sched_insert(t); -======= - rc = os_sched_insert(t, 0); ->>>>>>> 5aae54c3cfdb6e772bedf9235b354855aa7f536a if (rc != OS_OK) { goto err; } |