From 2f4546a6ca3f89e508ec236e306565ca94e52317 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 6 Oct 2023 12:52:38 -0700 Subject: [PATCH] Fix stealth merge conflict --- tests/libcxx/expected_results.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/libcxx/expected_results.txt b/tests/libcxx/expected_results.txt index 99f0b15afb..47078c4b3f 100644 --- a/tests/libcxx/expected_results.txt +++ b/tests/libcxx/expected_results.txt @@ -367,7 +367,9 @@ std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp SKIPPED # P1169R4 static operator() std/thread/futures/futures.task/futures.task.members/ctad.static.compile.pass.cpp:0 FAIL +std/thread/futures/futures.task/futures.task.members/ctad.static.compile.pass.cpp:1 FAIL std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/ctad.static.compile.pass.cpp:0 FAIL +std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/ctad.static.compile.pass.cpp:1 FAIL # *** MISSING LWG ISSUE RESOLUTIONS ***