Fix bad merge

02f56731 · Stan Hu · 28832fef · 02f56731
Commit 02f56731 authored Dec 16, 2015 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/models/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