Commit 3438b26c authored by Raphael Michel's avatar Raphael Michel

Fix invalid merge things

parent 51068ad2
Pipeline #6831 passed with stage
in 4 minutes and 8 seconds