resolve merge conflict

This commit is contained in:
Kristján Eldjárn 2022-09-09 13:44:52 -07:00
parent c913d4f04a
commit 55bc63f9be

View File

@ -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",