Commit 1133b322 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in spec/factories/namespaces.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 898e3496
......@@ -19,7 +19,6 @@ FactoryBot.define do
owner.namespace = namespace
end
end
<<<<<<< HEAD
trait :with_build_minutes do
namespace_statistics factory: :namespace_statistics, shared_runners_seconds: 400.minutes.to_i
......@@ -49,7 +48,5 @@ FactoryBot.define do
namespace.plan = create(evaluator.plan)
end
end
=======
>>>>>>> upstream/master
end
end
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