Commit 16df82e2 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 36272664 f51f2c58