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_db/td_ta_map_id2thr.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libpthread/linuxthreads_db/td_ta_map_id2thr.c')

diff --git a/libpthread/linuxthreads_db/td_ta_map_id2thr.c b/libpthread/linuxthreads_db/td_ta_map_id2thr.c
index a90286865..dc24533b8 100644
--- a/libpthread/linuxthreads_db/td_ta_map_id2thr.c
+++ b/libpthread/linuxthreads_db/td_ta_map_id2thr.c
@@ -18,7 +18,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include "thread_dbP.h"
-#include <linuxthreads/internals.h>
 
 
 td_err_e
-- 
cgit v1.2.3