Commit c919dd34 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents f6d161d2 f6daa639