resolve conflicts

This commit is contained in:
GunaTrika 2021-10-06 11:57:08 +05:30
parent 19300cbafc
commit 8d82591f29

View File

@ -44,12 +44,9 @@
"react-fast-marquee": "^1.1.4",
"react-merge-refs": "^1.1.0",
"react-use-measure": "^2.0.4",
<<<<<<< HEAD
"sharp": "^0.29.1",
"shopify-buy": "^2.11.0",
=======
"stripe": "^8.176.0",
>>>>>>> 3f0c38461b478a48520bd91ba9240bfec478b7fb
"swell-js": "^4.0.0-next.0",
"swr": "^0.5.6",
"tabbable": "^5.2.0",