Commit 07bd5230 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 4ae49556 525fb9bc