From 595f7f4f6ea29156ca15025f1d53febf7810f2f2 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Tue, 29 Jun 2021 06:16:10 -0700 Subject: [PATCH] Fixing `git rebase -X theirs smart_holder` issue. --- tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ac7212f3c..f7be2075b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -106,6 +106,7 @@ set(PYBIND11_TEST_FILES test_class_sh_disowning_mi.cpp test_class_sh_factory_constructors.cpp test_class_sh_inheritance.cpp + test_class_sh_shared_ptr_copy_move.cpp test_class_sh_trampoline_basic.cpp test_class_sh_trampoline_self_life_support.cpp test_class_sh_trampoline_shared_from_this.cpp