fix(deps): update dependency tailwind-merge to v2

3I-shikosai32 · Dec 25, 2024 · 0e77165 · 0e77165
1 parent ed4191b
commit 0e77165
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "recoil": "0.7.5",
     "sharp": "0.31.0",
     "superjson": "^1.10.1",
-    "tailwind-merge": "1.6.0",
+    "tailwind-merge": "2.6.0",
     "tailwindcss": "3.1.8",
     "urql": "3.0.3",
     "urql-custom-scalars-exchange": "^1.0.1"

diff --git a/yarn.lock b/yarn.lock
@@ -14558,10 +14558,10 @@ synchronous-promise@^2.0.15:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.16.tgz#669b75e86b4295fdcc1bb0498de9ac1af6fd51a9"
   integrity sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==
 
-tailwind-merge@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.6.0.tgz#dd652005544aa0b04628e69688b7108265f0d441"
-  integrity sha512-lfpys05uZMcVGIbgrrM/HlQGYKiPIcUhs76H1VrXo0gerpYkoLk4zjQTppdyAcBcmpzlzXJw7X0JniUKOr2hkg==
+tailwind-merge@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
+  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
 
 tailwindcss@3.1.8, tailwindcss@^3, tailwindcss@^3.1.3:
   version "3.1.8"