Merge pull request #133 from atlas-bi/renovate/tailwind-merge-2.x

chore(deps) Update dependency tailwind-merge to v2
atlas-bi · Dec 18, 2023 · 1f3ecf5 · 1f3ecf5
2 parents 77a0a56 + 53a0c14
commit 1f3ecf5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -147,7 +147,7 @@
     "samlify": "^2.8.10",
     "sharp": "^0.33.0",
     "slugify": "^1.6.6",
-    "tailwind-merge": "^1.12.0",
+    "tailwind-merge": "^2.0.0",
     "tailwindcss-animate": "^1.0.5",
     "tiny-invariant": "^1.3.1"
   },
@@ -229,5 +229,5 @@
       "npm run format"
     ]
   },
-  "version": "1.1.11"
+  "version": "1.1.12"
 }