Commit 64a151fc authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in app/services/clusters/create_service.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 5fb962e3
...@@ -29,13 +29,9 @@ module Clusters ...@@ -29,13 +29,9 @@ module Clusters
end end
def can_create_cluster? def can_create_cluster?
<<<<<<< HEAD
project.clusters.empty?
=======
return true if project.clusters.empty? return true if project.clusters.empty?
project.feature_available?(:multiple_clusters) project.feature_available?(:multiple_clusters)
>>>>>>> origin/master
end end
end end
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