-
Patrik Huber authored
# Resolved conflicts: # include/eos/fitting/RenderingParameters.hpp # include/eos/fitting/contour_correspondence.hpp
5fe5a737
# Resolved conflicts: # include/eos/fitting/RenderingParameters.hpp # include/eos/fitting/contour_correspondence.hpp