Commit e01d873c by Bodor Máté

Resolve merge conflict

parents f5b818e4 78f5ae4a
Pipeline #757 failed with stage
in 37 seconds