3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge

Browse source
This commit is contained in:
Lukas Matena 2022-08-15 14:02:50 +02:00
parent bce2b148f4
commit deac513faa
13 changed files with 280 additions and 6844 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/libslic3r/CMakeLists.txt
View file

@ -4,11 +4,8 @@ add_executable(${_TEST_NAME}_tests
${_TEST_NAME}_tests.cpp
test_3mf.cpp
test_aabbindirect.cpp
<<<<<<< HEAD
test_kdtreeindirect.cpp
=======
test_arachne.cpp
>>>>>>> master_250
test_clipper_offset.cpp
test_clipper_utils.cpp
test_color.cpp