Commit 02f56731 authored by Stan Hu's avatar Stan Hu

Fix bad merge

parent 28832fef
......@@ -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