Resolve conflicts

app/models/repository.rb

@@ -929,7 +929,6 @@ class Repository
 
   def fetch_remote(remote, forced: false, ssh_auth: nil, no_tags: false, prune: true)
     gitlab_shell.fetch_remote(raw_repository, remote, ssh_auth: ssh_auth, forced: forced, no_tags: no_tags, prune: prune)
-<<<<<<< HEAD
   end
 
   def async_remove_remote(remote_name)
@@ -944,8 +943,6 @@ class Repository
     end
 
     job_id
-=======
->>>>>>> upstream/master
   end
 
   def fetch_source_branch!(source_repository, source_branch, local_ref)

app/views/projects/settings/repository/show.html.haml

@@ -2,12 +2,9 @@
 - page_title "Repository"
 - @content_class = "limit-container-width" unless fluid_layout
 
-<<<<<<< HEAD
 = render "projects/push_rules/index"
 = render "projects/mirrors/show"
 
-=======
->>>>>>> upstream/master
 -# Protected branches & tags use a lot of nested partials.
 -# The shared parts of the views can be found in the `shared` directory.
 -# Those are used throughout the actual views. These `shared` views are then

doc/api/discussions.md

 # Discussions API
 
-<<<<<<< HEAD
 Discussions are set of related notes on snippets, issues or epics.
-=======
-Discussions are set of related notes on snippets or issues.
->>>>>>> upstream/master
 
 ## Issues
 
@@ -413,7 +409,6 @@ Parameters:
 ```bash
 curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/5/snippets/11/discussions/636
 ```
-<<<<<<< HEAD
 
 ## Epics
 
@@ -618,5 +613,3 @@ Parameters:
 ```bash
 curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/groups/5/epics/11/discussions/636
 ```
-=======
->>>>>>> upstream/master

lib/api/discussions.rb

@@ -5,11 +5,7 @@ module API
 
     before { authenticate! }
 
-<<<<<<< HEAD
     NOTEABLE_TYPES = [Issue, Snippet, Epic].freeze
-=======
-    NOTEABLE_TYPES = [Issue, Snippet].freeze
->>>>>>> upstream/master
 
     NOTEABLE_TYPES.each do |noteable_type|
       parent_type = noteable_type.parent_class.to_s.underscore

lib/api/helpers/notes_helpers.rb

 module API
   module Helpers
     module NotesHelpers
-<<<<<<< HEAD
       prepend EE::API::Helpers::NotesHelpers
 
-=======
->>>>>>> upstream/master
       def update_note(noteable, note_id)
         note = noteable.notes.find(params[:note_id])
 

lib/gitlab/utils.rb

@@ -68,7 +68,6 @@ module Gitlab
       nil
     end
 
-<<<<<<< HEAD
     # EE below
     def try_megabytes_to_bytes(size)
       Integer(size).megabytes
@@ -76,9 +75,6 @@ module Gitlab
       size
     end
 
-=======
-    # Used in EE
->>>>>>> upstream/master
     # Accepts either an Array or a String and returns an array
     def ensure_array_from_string(string_or_array)
       return string_or_array if string_or_array.is_a?(Array)

spec/requests/api/discussions_spec.rb

@@ -30,7 +30,6 @@ describe API::Discussions do
       let(:note) { snippet_note }
     end
   end
-<<<<<<< HEAD
 
   context "when noteable is an Epic" do
     let(:group) { create(:group, :public, owner: user) }
@@ -49,6 +48,4 @@ describe API::Discussions do
       let(:note) { epic_note }
     end
   end
-=======
->>>>>>> upstream/master
 end

spec/requests/api/notes_spec.rb

@@ -182,7 +182,6 @@ describe API::Notes do
       end
     end
   end
-<<<<<<< HEAD
 
   context "when noteable is an Epic" do
     let(:group) { create(:group, :public, owner: user) }
@@ -201,6 +200,4 @@ describe API::Notes do
       let(:note) { epic_note }
     end
   end
-=======
->>>>>>> upstream/master
 end