Skip to content

Commit d2347f8

Browse files
committed
Fix missed merge conflict
I had removed these gems from Gemfile since they were only explicitly needed for older versions of Rails with newer versions of Ruby. Now that we are on new Rails, they were not needed. However, a dependency update landed in main before I merged this change and I failed to manage the merge conflict appropriately. This resolves the problem I introduced.
1 parent 3ec6d32 commit d2347f8

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

Gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ gem 'graphql'
1111
gem 'jwt'
1212
gem 'lograge'
1313
gem 'mitlibraries-theme', git: 'https://github.com/mitlibraries/mitlibraries-theme', tag: 'v1.0.2'
14-
gem 'net-imap', require: false
15-
gem 'net-pop', require: false
16-
gem 'net-smtp', require: false
1714
gem 'opensearch-ruby'
1815
gem 'puma'
1916
gem 'rack-attack'

0 commit comments

Comments
 (0)