Commit 1d6fa56f authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents ebd34cb2 71deb78c