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

Fix bad merge

/cc: @dzaporozhets 

See merge request !2116

app/models/project.rb

@@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
     end
   end
-<<<<<<< HEAD
   def any_runners?(&block)
     if runners.active.any?(&block)
       return true