squash: bad merge

Author: arielvalentin

instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec

@@ -23,11 +23,7 @@ Gem::Specification.new do |spec|
                Dir.glob('*.md') +
                ['LICENSE', '.yardopts']
   spec.require_paths = ['lib']
-<<<<<<< Updated upstream
-  spec.required_ruby_version = '>= 3.0'
-=======
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../RUBY_REQUIREMENT', __dir__))}"
->>>>>>> Stashed changes
 
   spec.add_dependency 'opentelemetry-api', '~> 1.4.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_support', '~> 0.7'