Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
saurabhbhatia committed Aug 16, 2024
2 parents 462dcbb + e35331b commit 064d8ae
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ GEM
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.963.0)
aws-sdk-core (3.201.4)
aws-partitions (1.965.0)
aws-sdk-core (3.201.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.157.0)
aws-sdk-s3 (1.158.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -176,7 +176,7 @@ GEM
sanitize (< 7)
globalid (1.2.1)
activesupport (>= 6.1)
graphiql-rails (1.10.0)
graphiql-rails (1.10.1)
railties
graphql (2.3.14)
base64
Expand All @@ -187,7 +187,7 @@ GEM
rails (>= 4.2, < 7.2)
zeitwerk
hashie (5.0.0)
honeybadger (5.15.5)
honeybadger (5.15.6)
httparty (0.22.0)
csv
mini_mime (>= 1.0.0)
Expand Down Expand Up @@ -227,7 +227,7 @@ GEM
method_source (1.1.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
minitest (5.25.0)
minitest (5.25.1)
monetize (1.13.0)
money (~> 6.12)
money (6.19.0)
Expand Down Expand Up @@ -262,7 +262,7 @@ GEM
rack-protection
orm_adapter (0.5.0)
pagy (9.0.5)
parallel (1.26.2)
parallel (1.26.3)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -353,7 +353,7 @@ GEM
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.3)
rspec-rails (6.1.4)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand Down Expand Up @@ -405,14 +405,14 @@ GEM
ffi (~> 1.12)
logger
rubyzip (2.3.2)
sanitize (6.1.2)
sanitize (6.1.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sidekiq (7.3.0)
sidekiq (7.3.1)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
logger
Expand Down

0 comments on commit 064d8ae

Please sign in to comment.