Resolve conflicts

spec/features/projects/blobs/edit_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 feature 'Editing file blob', js: true do
   include TreeHelper
 
-<<<<<<< HEAD
-  let(:project) { create(:project, :public) }
-=======
   let(:project) { create(:project, :public, :repository) }
->>>>>>> upstream/master
   let(:merge_request) { create(:merge_request, source_project: project, source_branch: 'feature', target_branch: 'master') }
   let(:branch) { 'master' }
   let(:file_path) { project.repository.ls_files(project.repository.root_ref)[1] }

spec/lib/gitlab/import_export/fork_spec.rb

@@ -2,11 +2,7 @@ require 'spec_helper'
 
 describe 'forked project import' do
   let(:user) { create(:user) }
-<<<<<<< HEAD
-  let!(:project_with_repo) { create(:project, name: 'test-repo-restorer', path: 'test-repo-restorer') }
-=======
   let!(:project_with_repo) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
->>>>>>> upstream/master
   let!(:project) { create(:empty_project, name: 'test-repo-restorer-no-repo', path: 'test-repo-restorer-no-repo') }
   let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
   let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }

spec/lib/gitlab/import_export/merge_request_parser_spec.rb

@@ -2,13 +2,8 @@ require 'spec_helper'
 
 describe Gitlab::ImportExport::MergeRequestParser do
   let(:user) { create(:user) }
-<<<<<<< HEAD
-  let!(:project) { create(:project, name: 'test-repo-restorer', path: 'test-repo-restorer') }
-  let(:forked_from_project) { create(:project) }
-=======
   let!(:project) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
   let(:forked_from_project) { create(:project, :repository) }
->>>>>>> upstream/master
   let(:fork_link) { create(:forked_project_link, forked_from_project: project) }
 
   let!(:merge_request) do

spec/lib/gitlab/import_export/repo_restorer_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 describe Gitlab::ImportExport::RepoRestorer do
   describe 'bundle a project Git repo' do
     let(:user) { create(:user) }
-<<<<<<< HEAD
-    let!(:project_with_repo) { create(:project, name: 'test-repo-restorer', path: 'test-repo-restorer') }
-=======
     let!(:project_with_repo) { create(:project, :repository, name: 'test-repo-restorer', path: 'test-repo-restorer') }
->>>>>>> upstream/master
     let!(:project) { create(:empty_project) }
     let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
     let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }

spec/requests/api/todos_spec.rb

 require 'spec_helper'
 
 describe API::Todos do
-<<<<<<< HEAD
-  let(:project_1) { create(:project) }
-=======
   let(:project_1) { create(:project, :repository) }
->>>>>>> upstream/master
   let(:project_2) { create(:empty_project) }
   let(:author_1) { create(:user) }
   let(:author_2) { create(:user) }