(chore) Set continue on error and conflict on test#1694

gianlucam76 merged 1 commit intoprojectsveltos:mainprojectsveltos/addon-controller:mainfrom

gianlucam76:continue-on-errorgianlucam76/addon-controller:continue-on-errorCopy head branch name to clipboard