mirror of
https://github.com/LaconicNetwork/laconic.com.git
synced 2026-01-14 22:08:20 +00:00
resolve merge conflict
This commit is contained in:
parent
c913d4f04a
commit
55bc63f9be
@ -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",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user