Commit e3fa5839 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict with spec/lib/ci/gitlab_ci_yaml_processor_spec.rb |...

Resolve conflict with spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | spec/lib/gitlab/ci/yaml_processor_spec.rb
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 374442b1
This diff is collapsed.
......@@ -2,7 +2,7 @@ require 'spec_helper'
module Gitlab
module Ci
describe YamlProcessor, :lib do
describe YamlProcessor do
subject { described_class.new(config, path) }
let(:path) { 'path' }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment