Skip to content

Commit d915acc

Browse files
committed
resolve conflict
2 parents e2c191b + 2d1364b commit d915acc

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

frameworks/Ruby/agoo/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
oj (3.16.3)
88
bigdecimal (>= 3.0)
99
pg (1.5.6)
10-
rack (3.0.11)
10+
rack (3.0.12)
1111

1212
PLATFORMS
1313
ruby

frameworks/Ruby/rails/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ GEM
167167
net-smtp (0.5.0)
168168
net-protocol
169169
nio4r (2.7.4)
170-
nokogiri (1.16.8)
170+
nokogiri (1.18.3)
171171
mini_portile2 (~> 2.8.2)
172172
racc (~> 1.4)
173-
nokogiri (1.16.8-x86_64-darwin)
173+
nokogiri (1.18.3-x86_64-darwin)
174174
racc (~> 1.4)
175-
nokogiri (1.16.8-x86_64-linux)
175+
nokogiri (1.18.3-x86_64-linux-gnu)
176176
racc (~> 1.4)
177177
openssl (3.2.0)
178178
pg (1.5.9)
@@ -197,7 +197,7 @@ GEM
197197
puma (6.5.0)
198198
nio4r (~> 2.0)
199199
racc (1.8.1)
200-
rack (3.1.8)
200+
rack (3.1.10)
201201
rack-session (2.0.0)
202202
rack (>= 3.0.0)
203203
rack-test (2.1.0)

frameworks/Rust/axum/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frameworks/Rust/ohkami/rt_tokio/Cargo.lock

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)