And fix another rebase mistake

This commit is contained in:
Tobias Lindahl 2019-06-26 12:55:24 +02:00
parent fc7f7bb6e6
commit 1ca0551700