fix merge conflicts

2026-09-11 19:17:33 +00:00 · 2026-07-15 22:09:47 +08:00
parent 635f5a3529 d2b5008156
commit 8ba478913f
1024 changed files with 214936 additions and 22122 deletions
--- a/tests/slic3rutils/CMakeLists.txt
+++ b/tests/slic3rutils/CMakeLists.txt
@@ -4,8 +4,8 @@ add_executable(${_TEST_NAME}_tests
    test_action_source.cpp
    test_plugin_host_api.cpp
    test_plugin_callback_list.cpp
-    test_plugin_capability_identifier.cpp
    test_plugin_install.cpp
+    test_plugin_lifecycle.cpp
    test_slicing_pipeline_bindings.cpp
    test_plugin_sort.cpp
    test_speed_dial_action_id.cpp