From 80c69d8a1268d977bf78b0d30dcda9bb569cff69 Mon Sep 17 00:00:00 2001 From: Natasha Nunn Date: Thu, 26 Aug 2021 14:16:46 -0600 Subject: [PATCH] Update Gemfile.lock --- Gemfile.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 860ca39c..fbd92d55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,13 +259,8 @@ 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)