diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 13:41:03 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 13:41:10 +0200 |
| commit | 9c2214f202e98d0427d86a57888574327a6607dd (patch) | |
| tree | 81d283a650b5774d5e2d0f548810af4231aa31e1 | |
| parent | ef44138ce42de6a02724a7be10b6eb08873a3c1e (diff) | |
| download | gitlab-ce-9c2214f202e98d0427d86a57888574327a6607dd.tar.gz | |
Remove stray conflict marker
| -rw-r--r-- | app/models/concerns/participable.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb index f5f973c0e69..85367f89f4f 100644 --- a/app/models/concerns/participable.rb +++ b/app/models/concerns/participable.rb @@ -37,7 +37,6 @@ module Participable # Be aware that this method makes a lot of sql queries. # Save result into variable if you are going to reuse it inside same request -<<<<<<< HEAD def participants(current_user = self.author, load_lazy_references: true) participants = self.class.participant_attrs.flat_map do |attr| value = |