From a7f5f7a6af895abdf51702c715308a1e941f5504 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Mar 2021 22:12:21 +0000
Subject: [PATCH] Fix mimemagic 036 yank issue

---
 Gemfile.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d317704b78..63f31a1f35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -218,7 +218,7 @@ GEM
       devise (>= 4.0.0, < 5.0.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
-    erubis (2.7.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
     excon (0.79.0)
     execjs (2.7.0)
@@ -327,10 +327,11 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.3)
-    mini_portile2 (2.5.0)    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
->>>>>>> fa2cdf337... Update Rails to 5.2
+    mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
     minitest (5.14.4)