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

Fix bad merge /cc: @dzaporozhets See merge request !2116

Merge branch 'fix-bad-merge' into 'master'
4dfd4e03 · Douwe Maan · 9908da17 · 02f56731 · 4dfd4e03
Commit 4dfd4e03 authored Dec 16, 2015 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

project.rb app/models/project.rb +0 -1

No files found.
--- 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