Commit 45313db0 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 19a24eee 5440e481