Resolve conflict with spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | spec/lib/gitlab/ci/yaml_processor_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>