From 3c19f4e174c887e2a3f66320d0401eea7554344c Mon Sep 17 00:00:00 2001 From: ylavic Date: Sun, 26 Jun 2022 10:55:35 +0000 Subject: test/testlock: Follow up to r1902219: Axe spurious merge artifact. Somehow one of the "return NULL" was already in 1.8.x, don't double it. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1902254 13f79535-47bb-0310-9956-ffa450edef68 --- test/testlock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/test/testlock.c b/test/testlock.c index d2f9b2a49..e3437c11f 100644 --- a/test/testlock.c +++ b/test/testlock.c @@ -111,7 +111,6 @@ static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data break; } return NULL; - return NULL; } /* Sleepy-loop until f_ value matches val: */ -- cgit v1.2.1