Commit 4dfd4e03 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-bad-merge' into 'master'

Fix bad merge

/cc: @dzaporozhets 

See merge request !2116
parents 9908da17 02f56731
......@@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
end
end
<<<<<<< HEAD
def any_runners?(&block)
if runners.active.any?(&block)
return true
......
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