fix merge conflict

Author: donoghuc

qa/rspec/commands/base.rb

@@ -69,21 +69,10 @@ def stop_service(service)
       service_manager(service, "stop")
     end
 
-<<<<<<< HEAD
     def run_command(cmd)
-      response = nil
-      response = sudo_exec!("JARS_SKIP='true' #{cmd}")
-      response
-=======
-    def run_sudo_command(cmd)
       sudo_exec!("#{ENV_CLEANUP} JARS_SKIP='true' #{cmd}")
     end
 
-    def run_command(cmd)
-      exec!("#{ENV_CLEANUP} JARS_SKIP='true' #{cmd}")
->>>>>>> 7e9c38455 (Use gradle and bundled jruby for acceptance tests orchestration (#18536))
-    end
-
     def replace_in_gemfile(pattern, replace)
       gemfile = File.join(LOGSTASH_PATH, "Gemfile")
       cmd = "sed -i.sedbak 's/#{pattern}/#{replace}/' #{gemfile}"