From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:00:19 -0600
Subject: resolve merge

---
 libpthread/linuxthreads/queue.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libpthread/linuxthreads/queue.h')

diff --git a/libpthread/linuxthreads/queue.h b/libpthread/linuxthreads/queue.h
index e50517f77..01d18d16e 100644
--- a/libpthread/linuxthreads/queue.h
+++ b/libpthread/linuxthreads/queue.h
@@ -21,7 +21,6 @@
 static __inline__ void enqueue(pthread_descr * q, pthread_descr th)
 {
   int prio = th->p_priority;
-  ASSERT(th->p_nextwaiting == NULL);
   for (; *q != NULL; q = &((*q)->p_nextwaiting)) {
     if (prio > (*q)->p_priority) {
       th->p_nextwaiting = *q;
-- 
cgit v1.2.3