Update nokogiri

thoughtbot · Apr 8, 2021 · f26fa82 · f26fa82
1 parent d0d554c
commit f26fa82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - head
-          - 3.0.0
+          - 3.0.1
           - 2.7.2
           - 2.6.6
         appraisal:

diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock
@@ -104,7 +104,11 @@ GEM
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     msgpack (1.4.2)
+<<<<<<< HEAD
     nio4r (2.5.7)
+=======
+    nio4r (2.5.5)
+>>>>>>> Update nokogiri
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)