Conflit sur controls.js resolu

3 jobs for master
Status Job ID Name Coverage
  Build
failed #50743
build

 
  Test
skipped #50745
allowed to fail
code_quality
failed #50744
test

 
Name Stage Failure
failed
test Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log