tree b54b622402057e530cc4b05fb2ffa36767ba726e
parent 174f373cf066afc3e3be35576adf3709b0ee278b
parent f0c4318e7b8d5cbf91723c71a4ba20d1bd0cfaf5
author Máximo Cuadros <mcuadros@gmail.com> 1536264300 +0200
committer Máximo Cuadros <mcuadros@gmail.com> 1536264300 +0200

worktree: solve merge conflicts