merge

ualbertalib · Aug 26, 2021 · 8b3f1df · 8b3f1df
2 parents f0ae17f + 62df7a9
commit 8b3f1df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -48,7 +48,7 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.6'
+  gem 'listen', '>= 3.0.5', '< 3.8'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
     erubi (1.10.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.15.1)
+    ffi (1.15.3)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
     globalid (0.5.2)
@@ -259,8 +259,13 @@ DEPENDENCIES
   friendly_id
   htmlentities
   jbuilder (~> 2.11)
+<<<<<<< HEAD
   libv8 (~> 7.3, >= 7.3.492.27.0)
   listen (>= 3.0.5, < 3.6)
+=======
+  libv8 (~> 8.4)
+  listen (>= 3.0.5, < 3.8)
+>>>>>>> 62df7a9bf92234e3be97b8472d830161d4f2ca60
   mini_magick (>= 4.9.4)
   mysql2 (~> 0.5.3)
   puma (~> 5.4)