diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 16:48:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 16:48:30 +0000 |
| commit | 4dfd4e0366c5b29a02a03c943b9f87c2070df4c3 (patch) | |
| tree | fda6168afd0b4f2c19433f1b7fd058f33c4ba4e7 | |
| parent | 9908da17c13b582c3faa920e53691658bfe23896 (diff) | |
| parent | 02f56731713948be8443e6e97eb55ae05b5ac95a (diff) | |
| download | gitlab-ce-4dfd4e0366c5b29a02a03c943b9f87c2070df4c3.tar.gz | |
Merge branch 'fix-bad-merge' into 'master'
Fix bad merge
/cc: @dzaporozhets
See merge request !2116
| -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 |