Diffusion Krita 982a7f1e2162

Fix merge error

Authored by rempt on Jun 5 2019, 4:07 PM.