Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmytro-savochkin
dmytro-savochkin committed Aug 10, 2024
1 parent 05bbfd8 commit 9478a1e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions gemfiles/activerecord_7.2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ source "https://rubygems.org"

gem "activerecord", "~> 7.2"
gem "activesupport", "~> 7.2"
<<<<<<< Updated upstream
gem "standard", "~> 1.16"
=======
gem "standard", "~> 1.31"
>>>>>>> Stashed changes

gemspec path: "../"

0 comments on commit 9478a1e

Please sign in to comment.