merge new into master

node_modules/tailwind-merge/src/index.ts

@@ -0,0 +1,17 @@
+export { createTailwindMerge } from './lib/create-tailwind-merge'
+export { getDefaultConfig } from './lib/default-config'
+export { extendTailwindMerge } from './lib/extend-tailwind-merge'
+export { fromTheme } from './lib/from-theme'
+export { mergeConfigs } from './lib/merge-configs'
+export { twJoin, type ClassNameValue } from './lib/tw-join'
+export { twMerge } from './lib/tw-merge'
+export {
+    type ClassValidator,
+    type Config,
+    type ConfigExtension,
+    type DefaultClassGroupIds,
+    type DefaultThemeGroupIds,
+    type ExperimentalParseClassNameParam,
+    type ParsedClassName as ExperimentalParsedClassName,
+} from './lib/types'
+export * as validators from './lib/validators'