Fixing git rebase -X theirs smart_holder issue.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-29 06:16:10 -07:00 committed by Ralf W. Grosse-Kunstleve
parent e2108546e1
commit 595f7f4f6e

View File

@ -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