From 55bc63f9beab592198795ea92255eea06c87c097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristj=C3=A1n=20Eldj=C3=A1rn?= <kristjan@eldjarn.net>
Date: Fri, 9 Sep 2022 13:44:52 -0700
Subject: [PATCH] resolve merge conflict

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 18005f6..9eb5e2b 100644
--- a/package.json
+++ b/package.json
@@ -46,11 +46,8 @@
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.0.0",
     "react-fast-marquee": "^1.3.1",
-<<<<<<< HEAD
     "react-google-recaptcha": "^2.1.0",
     "react-google-recaptcha-v3": "^1.10.0",
-=======
->>>>>>> 4a203339c5143fd20a785d9ad1153afb4a02b7fe
     "react-hook-form": "^7.30.0",
     "react-mailchimp-subscribe": "^2.1.3",
     "react-merge-refs": "^1.1.0",