Merge branch 'fix-bad-merge' into 'master'
Fix bad merge /cc: @dzaporozhets See merge request !2116
This commit is contained in:
commit
4dfd4e0366
1 changed files with 0 additions and 1 deletions
|
@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
<<<<<<< HEAD
|
||||
def any_runners?(&block)
|
||||
if runners.active.any?(&block)
|
||||
return true
|
||||
|
|
Loading…
Reference in a new issue