mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 15:12:01 +00:00
Fixing git rebase -X theirs smart_holder
issue.
This commit is contained in:
parent
e2108546e1
commit
595f7f4f6e
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user