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

Fix bad merge /cc: @dzaporozhets See merge request !2116
2015-12-16 16:48:30 +00:00 · 2015-12-16 16:48:30 +00:00 · 4dfd4e0366
parent 9908da17c1 02f5673171
commit 4dfd4e0366
1 changed files with 0 additions and 1 deletions
--- a/app/models/project.rb
+++ b/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