From c79037380488bfada56aec0029b9aaccb95ad940 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Sun, 13 Jun 2021 18:29:57 -0700 Subject: [PATCH] resolve gemfile conflict --- Gemfile.lock | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f9cc4dfa8c..0ee325c3a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,8 @@ GEM actioncable (6.1.3.2) actionpack (= 6.1.3.2) activesupport (= 6.1.3.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) actionmailbox (6.1.3.2) actionpack (= 6.1.3.2) activejob (= 6.1.3.2) @@ -372,7 +374,7 @@ GEM mimemagic (0.4.3) nokogiri (~> 1) rake - mini_mime (1.1.0) + mini_mime (1.0.3) mini_portile2 (2.5.3) mini_racer (0.4.0) libv8-node (~> 15.14.0.0) @@ -385,6 +387,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) + nio4r (2.5.7) nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -647,6 +650,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) wicked_pdf (2.1.0)