Commit 602f098c authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict

parents 4b29c0b8 2cd1f81f