Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(tile): integrate content-top and content-bottom slot changes per #8984 #9012

Merged

Conversation

eriklharper
Copy link
Contributor

@eriklharper eriklharper commented Mar 28, 2024

Related Issue: #8984

Summary

This PR integrates recently merged changes to Tile in main into the tokens branch in order to (hopefully) eliminate merge conflicts when the tokens branch goes into main.

@jcfranco jcfranco changed the title feat(tile): integrate content-top and content-bottom slot changes per #8984 chore(tile): integrate content-top and content-bottom slot changes per #8984 Mar 29, 2024
@jcfranco jcfranco merged commit 51585dc into epic/7180-component-tokens Mar 29, 2024
5 checks passed
@jcfranco jcfranco deleted the eriklharper/7180-tile-main-sync branch March 29, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants