Resolve conflicts in git_user_default_ssh_config_check.rb

lib/system_check/app/git_user_default_ssh_config_check.rb

@@ -11,17 +11,10 @@ module SystemCheck
       ].freeze
 
       set_name 'Git user has default SSH configuration?'
-<<<<<<< HEAD
-      set_skip_reason 'skipped (Geo secondary, or git user is not present / configured)'
-
-      def skip?
-        Gitlab::Geo.secondary? || !home_dir || !File.directory?(home_dir)
-=======
       set_skip_reason 'skipped (GitLab read-only, or git user is not present / configured)'
 
       def skip?
         Gitlab::Database.read_only? || !home_dir || !File.directory?(home_dir)
->>>>>>> ce-com/master
       end
 
       def check?

spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb

@@ -40,18 +40,10 @@ describe SystemCheck::App::GitUserDefaultSSHConfigCheck do
       it { is_expected.to eq(expected_result) }
     end
 
-<<<<<<< HEAD
-    # EE-only
-    it 'skips Geo secondaries' do
-      stub_user
-      stub_home_dir
-      allow(Gitlab::Geo).to receive(:secondary?).and_return(true)
-=======
     it 'skips GitLab read-only instances' do
       stub_user
       stub_home_dir
       allow(Gitlab::Database).to receive(:read_only?).and_return(true)
->>>>>>> ce-com/master
 
       is_expected.to be_truthy
     end