gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-07 21:48:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: merge conflicts in Gemfile.lock broke deployments. Corrected merge conflicts

Browse source
This commit is contained in:
Nelson Jovel 2023-06-28 21:19:05 -07:00
parent 1fc1c8348f
commit 11948f23ac
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Gemfile.lock
View file

@ -235,28 +235,14 @@ GEM
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.3.3)
net-protocol
<<<<<<< HEAD
net-ssh (7.1.0)
newrelic_rpm (9.0.0)
nio4r (2.5.8)
<<<<<<< HEAD
nokogiri (1.14.2-arm64-darwin)
=======
net-ssh (7.0.1)
newrelic_rpm (8.16.0)
nio4r (2.5.8)
nokogiri (1.15.2-arm64-darwin)
>>>>>>> 151dbb2 (updated Nokogiri as part of security vulnerability and adding updated file Gemfile.lock)
racc (~> 1.4)
<<<<<<< HEAD
=======
>>>>>>> parent of ac03745 (added a rake task to output stray responses)
nokogiri (1.14.2-x86_64-linux)
=======
nokogiri (1.15.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.2-x86_64-linux)
>>>>>>> d42464c (updated Nokogiri as part of security vulnerability and adding updated file Gemfile.lock)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)