# Conflicts: # src/libslic3r/Technologies.hpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/Gizmos/GLGizmosManager.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/Selection.hpp
3b1f1d9444