From 02f56731713948be8443e6e97eb55ae05b5ac95a Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 16 Dec 2015 08:02:28 -0800
Subject: [PATCH] Fix bad merge

---
 app/models/project.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index f14719630cf..13fd383237c 100644
--- 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