Fixes conflicts git_access and namespace_spec files

lib/gitlab/git_access.rb

@@ -107,15 +107,9 @@ module Gitlab
 
     def check_project_moved!
       return if redirected_path.nil?
-<<<<<<< HEAD
 
       project_moved = Checks::ProjectMoved.new(project, user, redirected_path, protocol)
 
-=======
-
-      project_moved = Checks::ProjectMoved.new(project, user, redirected_path, protocol)
-
->>>>>>> upstream/master
       if project_moved.permanent_redirect?
         project_moved.add_redirect_message
       else

spec/models/namespace_spec.rb

@@ -684,7 +684,6 @@ describe Namespace do
     end
   end
 
-<<<<<<< HEAD
   describe '#root_ancestor' do
     it 'returns the top most ancestor', :nested_groups do
       root_group = create(:group)
@@ -698,8 +697,6 @@ describe Namespace do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe "#allowed_path_by_redirects" do
     let(:namespace1) { create(:namespace, path: 'foo') }