Fix conflicts in app/finders/issuable_finder.rb and spec/models/user_spec.rb

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

app/finders/issuable_finder.rb

@@ -338,8 +338,6 @@ class IssuableFinder
     # Ensure we always have an explicit sort order (instead of inheriting
     # multiple orders when combining ActiveRecord::Relation objects).
     params[:sort] ? items.sort_by_attribute(params[:sort], excluded_labels: label_names) : items.reorder(id: :desc)
-<<<<<<< HEAD
-=======
   end
 
   def by_assignee(items)
@@ -352,7 +350,6 @@ class IssuableFinder
     end
 
     items
->>>>>>> upstream/master
   end
 
   def by_author(items)

spec/models/user_spec.rb

@@ -1479,7 +1479,6 @@ describe User do
     end
   end
 
-<<<<<<< HEAD
   describe "#existing_member?" do
     it "returns true for exisitng user" do
       create :user, email: "bruno@example.com"
@@ -1501,8 +1500,6 @@ describe User do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe '#sort_by_attribute' do
     before do
       described_class.delete_all