Resolve conflict for app/helpers/groups_helper.rb

c8a77e38 · Lin Jen-Shin · 607b9f8c · c8a77e38
Commit c8a77e38 authored Oct 24, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/helpers/groups_helper.rb app/helpers/groups_helper.rb +0 -3

No files found.
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
 # frozen_string_literal: true
 module GroupsHelper
-<<<<<<< HEAD
  prepend EE::GroupsHelper
-=======
->>>>>>> upstream/master
  def group_overview_nav_link_paths
    %w[
      groups#show