Fix conflicts in lib/tasks/gitlab/check.rake

lib/tasks/gitlab/check.rake

@@ -33,14 +33,12 @@ namespace :gitlab do
         SystemCheck::App::RedisVersionCheck,
         SystemCheck::App::RubyVersionCheck,
         SystemCheck::App::GitVersionCheck,
-<<<<<<< HEAD
-        SystemCheck::App::ActiveUsersCheck,
-        SystemCheck::App::ElasticsearchCheck
-=======
         SystemCheck::App::ActiveUsersCheck
->>>>>>> ce/master
       ]
 
+      # EE only
+      checks << SystemCheck::App::ElasticsearchCheck
+
       SystemCheck.run('GitLab', checks)
     end
   end
@@ -544,7 +542,6 @@ namespace :gitlab do
     end
   end
 
-<<<<<<< HEAD
   namespace :geo do
     desc 'GitLab | Check Geo configuration and dependencies'
     task check: :environment do
@@ -582,14 +579,6 @@ namespace :gitlab do
         puts 'yes'.color(:green)
       else
         puts 'no'.color(:red)
-=======
-  # Helper methods
-  ##########################
-
-  def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(gitlab_shell_major_version, gitlab_shell_minor_version, gitlab_shell_patch_version)
-    current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
->>>>>>> ce/master
 
         try_fixing_it(
           'Follow Geo Setup instructions to configure primary and secondary nodes'
@@ -599,7 +588,6 @@ namespace :gitlab do
       end
     end
 
-<<<<<<< HEAD
     def check_nodes_http_connection
       return unless Gitlab::Geo.enabled?
 
@@ -644,8 +632,6 @@ namespace :gitlab do
     end
   end
 
-=======
->>>>>>> ce/master
   def check_repo_integrity(repo_dir)
     puts "\nChecking repo at #{repo_dir.color(:yellow)}"