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

Resolve merge conflict.

parents 04143d55 f51f2c58