Commit 40f5e60e authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 1f1338da 94fd13cb