thpool.c:458 ~ 464

modify Remark Message
2018-11-30 17:15:58 +09:00 · 2018-11-30 17:15:58 +09:00 · f0d75f72eb
parent 430251cb65
commit f0d75f72eb
1 changed files with 0 additions and 4 deletions
--- a/thpool.c
+++ b/thpool.c
@ -456,11 +456,7 @@ static void jobqueue_push(jobqueue* jobqueue_p, struct job* newjob){


 /* Get first job from queue(removes it from queue)
-<<<<<<< HEAD
- *
 * Notice: Caller MUST hold a mutex
-=======
->>>>>>> da2c0fe45e43ce0937f272c8cd2704bdc0afb490
 */
 static struct job* jobqueue_pull(jobqueue* jobqueue_p){