Resolve conflicts in MembersPreloader

983cc308 · James Edwards-Jones · 3b1151a0 · 983cc308
Commit 983cc308 authored Nov 06, 2018 by James Edwards-Jones
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/members_preloader.rb app/models/members_preloader.rb +0 -3

No files found.
--- a/app/models/members_preloader.rb
+++ b/app/models/members_preloader.rb
 # frozen_string_literal: true
 class MembersPreloader
-<<<<<<< HEAD
  prepend EE::MembersPreloader
-=======
->>>>>>> upstream/master
  attr_reader :members
  def initialize(members)