squash: bad merge

Author: arielvalentin

instrumentation/grpc/Gemfile

@@ -18,11 +18,7 @@ group :test do
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-test-helpers', '~> 0.4'
   gem 'rake', '~> 13.2'
-<<<<<<< HEAD
-  gem 'rubocop', '~> 1.72.2'
-=======
   gem 'rubocop', '~> 1.72.0'
->>>>>>> c3b6c2b0 (squash: bump rubocop)
   gem 'rubocop-performance', '~> 1.23.0'
   gem 'simplecov', '~> 0.22.0'
   gem 'yard', '~> 0.9'

instrumentation/http/Gemfile

@@ -15,11 +15,7 @@ group :test do
   gem 'opentelemetry-sdk', '~> 1.1'
   gem 'opentelemetry-test-helpers', '~> 0.3'
   gem 'rake', '~> 13.0'
-<<<<<<< HEAD
-  gem 'rubocop', '~> 1.72.2'
-=======
   gem 'rubocop', '~> 1.72.0'
->>>>>>> c3b6c2b0 (squash: bump rubocop)
   gem 'rubocop-performance', '~> 1.23.0'
   gem 'simplecov', '~> 0.22.0'
   gem 'webmock', '~> 3.24'