Resolve conflict in app/helpers/sorting_helper.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve conflict in app/helpers/sorting_helper.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
774252aa · Dmitriy Zaporozhets · 8450925e · 774252aa
Commit 774252aa authored Sep 25, 2017 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -162,7 +162,6 @@ module SortingHelper

  def sort_title_upvotes
    s_('SortOptions|Most popular')
-<<<<<<< HEAD
  end

  def sort_title_more_weight
@@ -171,8 +170,6 @@ module SortingHelper

  def sort_title_less_weight
    'Less weight'
-=======
->>>>>>> ce-com/master
  end

  def sort_title_last_joined