Skip to content

Commit d395b1f

Browse files
authored
Merge pull request #25 from benjaminmoon/dependabot/bundler/nokogiri-1.19.1
Bump nokogiri from 1.18.9 to 1.19.1
2 parents ffdf7ca + a1c1715 commit d395b1f

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

Gemfile.lock

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,11 @@ GEM
250250
jekyll-include-cache (~> 0.1)
251251
jekyll-paginate (~> 1.1)
252252
jekyll-sitemap (~> 1.3)
253-
<<<<<<< dependabot/bundler/faraday-2.14.1
254-
minitest (5.25.5)
255253
net-http (0.9.1)
256254
uri (>= 0.11.1)
257-
=======
258255
minitest (5.27.0)
259256
multipart-post (2.1.1)
260-
>>>>>>> main
261-
nokogiri (1.18.9)
257+
nokogiri (1.19.1)
262258
mini_portile2 (~> 2.8.2)
263259
racc (~> 1.4)
264260
octokit (4.25.1)
@@ -283,12 +279,8 @@ GEM
283279
rb-inotify (~> 0.9, >= 0.9.7)
284280
sawyer (0.9.3)
285281
addressable (>= 2.3.5)
286-
<<<<<<< dependabot/bundler/faraday-2.14.1
287282
faraday (>= 0.17.3, < 3)
288-
=======
289-
faraday (> 0.8, < 2.0)
290283
securerandom (0.4.1)
291-
>>>>>>> main
292284
simpleidn (0.2.1)
293285
unf (~> 0.1.4)
294286
terminal-table (1.8.0)

0 commit comments

Comments
 (0)