diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-16 08:02:28 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-16 08:02:28 -0800 |
| commit | 02f56731713948be8443e6e97eb55ae05b5ac95a (patch) | |
| tree | 04a81f659c1a6582b27a027ff5e27f3c0e1f8576 | |
| parent | 28832fef7c88f7050639791af8e51c4acb58cff6 (diff) | |
| download | gitlab-ce-02f56731713948be8443e6e97eb55ae05b5ac95a.tar.gz | |
Fix bad merge
| -rw-r--r-- | app/models/project.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 |