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

Resolve merge conflict.

parents dd254784 3ea8505d