Skip to content

G
gitlab-ce
Commit 9c2214f2 authored by Douwe Maan's avatar Douwe Maan
Browse files
Options

Remove stray conflict marker

parent ef44138c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
app/models/concerns/participable.rb
View file @ 9c2214f2
...@@ -37,7 +37,6 @@ module Participable ...@@ -37,7 +37,6 @@ module Participable
# Be aware that this method makes a lot of sql queries. # 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 # 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) def participants(current_user = self.author, load_lazy_references: true)
participants = self.class.participant_attrs.flat_map do |attr| participants = self.class.participant_attrs.flat_map do |attr|
value = value =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7