build(deps): bump tailwind_merge from 1.5.3 to 1.5.5 in /docs

Merged
DE
2mo ago
+3-3

Bumps tailwind_merge from 1.5.3 to 1.5.5.

Release notes

Sourced from tailwind_merge's releases.

v1.5.5

1.5.5 (2026-08-24)

Bug Fixes

  • config: merge bare bg-conic with other background image classes (#92)
  • config: make columns-auto conflict with other columns classes (#91)
  • config: support container scale in inline sizing groups (#90)
  • config: add none option to max-h class group (#89)

Miscellaneous Chores

  • add port-upstream skill (#93)

v1.5.4

1.5.4 (2026-08-13)

Bug Fixes

  • config: axis shorthands override logical sides (#87)
Changelog

Sourced from tailwind_merge's changelog.

1.5.5 (2026-08-24)

Bug Fixes

  • config: merge bare bg-conic with other background image classes (#92)
  • config: make columns-auto conflict with other columns classes (#91)
  • config: support container scale in inline sizing groups (#90)
  • config: add none option to max-h class group (#89)

Miscellaneous Chores

  • add port-upstream skill (#93)

1.5.4 (2026-08-13)

Bug Fixes

  • config: axis shorthands override logical sides (#87)
Commits
  • b670d64 Merge pull request #94 from gjtorikian/release-please
  • a549040 [skip test] release v1.5.5
  • a54982f Merge pull request #93 from gjtorikian/chore/port-upstream-skill
  • 3948b43 Merge pull request #92 from gjtorikian/fix/bare-bg-conic
  • 6ae91cc Merge pull request #91 from gjtorikian/fix/columns-auto
  • 092ec59 Merge pull request #90 from gjtorikian/fix/inline-sizing-container-scale
  • 3864c4a Merge pull request #89 from gjtorikian/fix/max-h-none
  • d3a3f50 [auto-lint]: Lint files
  • 840de11 chore: add port-upstream skill
  • 20b2d91 [auto-lint]: Lint files
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Summary by cubic

Updates tailwind_merge in /docs from 1.5.3 to 1.5.5 to pick up bug fixes for class conflict resolution (e.g., bg-conic, columns-auto, max-h-none).