Commit 2e46593c authored by Mathieu Valois's avatar Mathieu Valois
Browse files

Simplify merging

parent a7c9c31b