From d6cfd4112b4a6ad58e174b9f5c2a8cc8bf8f1543 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@commitchange.com>
Date: Thu, 16 Apr 2020 15:54:23 -0500
Subject: [PATCH] Update to Rack

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 277f7e6b..ec4eab69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -331,7 +331,11 @@ GEM
       puma (>= 2.7, < 5)
     rabl (0.14.1)
       activesupport (>= 2.3.14)
+<<<<<<< HEAD
     rack (2.0.9)
+=======
+    rack (2.2.2)
+>>>>>>> Update to Rack
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (5.4.2)