Commit 30993cb8 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents d1ed56db 3b8868f2