From 38abe0f98e59d9f841c78ec4e91e4115bc206483 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 19:05:55 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 1.11.0 to 1.12.0 in
 /frontend (#1467)

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 14 +++++++-------
 frontend/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index bccc794898..f1d4be3078 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -33,7 +33,7 @@
 				"svelte-portal": "^2.2.0",
 				"svelte-select": "^5.6.0",
 				"svelte-timezone-picker": "^2.0.3",
-				"tailwind-merge": "^1.9.1",
+				"tailwind-merge": "^1.12.0",
 				"vscode-languageclient": "^8.1.0",
 				"vscode-ws-jsonrpc": "3.0.0"
 			},
@@ -6833,9 +6833,9 @@
 			"peer": true
 		},
 		"node_modules/tailwind-merge": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.11.0.tgz",
-			"integrity": "sha512-oG3/328Y7LrfPMfkgMNxoqEk1ZQdXBxdphf9FFrreo8q0EtVIHt3bQf2IyFhQuVt8puB57lCRBNbazGhYAyz9w==",
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.12.0.tgz",
+			"integrity": "sha512-Y17eDp7FtN1+JJ4OY0Bqv9OA41O+MS8c1Iyr3T6JFLnOgLg3EvcyMKZAnQ8AGyvB5Nxm3t9Xb5Mhe139m8QT/g==",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/dcastil"
@@ -12329,9 +12329,9 @@
 			}
 		},
 		"tailwind-merge": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.11.0.tgz",
-			"integrity": "sha512-oG3/328Y7LrfPMfkgMNxoqEk1ZQdXBxdphf9FFrreo8q0EtVIHt3bQf2IyFhQuVt8puB57lCRBNbazGhYAyz9w=="
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.12.0.tgz",
+			"integrity": "sha512-Y17eDp7FtN1+JJ4OY0Bqv9OA41O+MS8c1Iyr3T6JFLnOgLg3EvcyMKZAnQ8AGyvB5Nxm3t9Xb5Mhe139m8QT/g=="
 		},
 		"tailwindcss": {
 			"version": "3.3.1",
diff --git a/frontend/package.json b/frontend/package.json
index 8283e5f1bf..b090962d23 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -92,7 +92,7 @@
 		"svelte-portal": "^2.2.0",
 		"svelte-select": "^5.6.0",
 		"svelte-timezone-picker": "^2.0.3",
-		"tailwind-merge": "^1.9.1",
+		"tailwind-merge": "^1.12.0",
 		"vscode-languageclient": "^8.1.0",
 		"vscode-ws-jsonrpc": "3.0.0"
 	},