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

Resolve merge conflict.

parents b3417339 ae3fc3c5