Skip to content
This repository has been archived by the owner on May 2, 2024. It is now read-only.

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@reesericci
reesericci committed Jan 31, 2024
1 parent 5da8fed commit 601f9a3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,5 @@ gem "doorkeeper-device_authorization_grant", "~> 1.0"
gem "mission_control-jobs", "~> 0.1.1"

gem "foreman", "~> 0.87.2"

gem "mission_control-jobs", "~> 0.1.1"

Check warning on line 133 in Gemfile

View workflow job for this annotation

GitHub Actions / StandardRB

Gemfile#L133 

Gem `mission_control-jobs` requirements already given on line 129 of the Gemfile.

0 comments on commit 601f9a3

Please sign in to comment.