Resolve conflicts in `spec/lib/gitlab/git_access_spec.rb`

spec/lib/gitlab/git_access_spec.rb

@@ -1163,7 +1163,6 @@ describe Gitlab::GitAccess do
     end
   end
 
-<<<<<<< HEAD
   describe 'Geo system permissions' do
     let(:actor) { :geo }
 
@@ -1171,8 +1170,6 @@ describe Gitlab::GitAccess do
     it { expect { push_access_check }.to raise_unauthorized(Gitlab::GitAccess::ERROR_MESSAGES[:upload]) }
   end
 
-=======
->>>>>>> upstream/master
   context 'terms are enforced' do
     before do
       enforce_terms