Prepare solving conflicts

Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz
2018-05-24 15:43:33 +02:00
committed by Jonas Franz
parent 2b6001b189
commit d25df5b5f0