From 11948f23aca53363f95d1df1adb99db7e95489ae Mon Sep 17 00:00:00 2001
From: Nelson Jovel <memoryman51@hotmail.com>
Date: Wed, 28 Jun 2023 21:19:05 -0700
Subject: [PATCH] fix: merge conflicts in Gemfile.lock broke deployments. 
 Corrected merge conflicts

---
 Gemfile.lock | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9e82b46d..aa33fd5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -235,28 +235,14 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.3.3)
       net-protocol
-<<<<<<< HEAD
-    net-ssh (7.1.0)
-    newrelic_rpm (9.0.0)
-    nio4r (2.5.8)
-<<<<<<< HEAD
-    nokogiri (1.14.2-arm64-darwin)
-=======
     net-ssh (7.0.1)
     newrelic_rpm (8.16.0)
     nio4r (2.5.8)
     nokogiri (1.15.2-arm64-darwin)
->>>>>>> 151dbb2 (updated Nokogiri as part of security vulnerability and adding updated file Gemfile.lock)
       racc (~> 1.4)
-<<<<<<< HEAD
-=======
->>>>>>> parent of ac03745 (added a rake task to output stray responses)
-    nokogiri (1.14.2-x86_64-linux)
-=======
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
->>>>>>> d42464c (updated Nokogiri as part of security vulnerability and adding updated file Gemfile.lock)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)