Commit 2c65a595 by Damien Moulard

fix merge conflict

parents 6fc24383 67c384d5
Pipeline #2102 passed with stage
in 1 minute 30 seconds