Merged
Conversation
Contributor
|
@felipemenezes098 is attempting to deploy a commit to the shadcn-pro Team on Vercel. A member of the Team first needs to authorize it. |
Collaborator
|
Can you fix the conflicts please? Tag me when done. I'll merge. |
62c2a10 to
379ea3d
Compare
Contributor
Author
|
@shadcn thanks, conflicts resolved |
379ea3d to
843a5e2
Compare
Contributor
Author
|
@shadcn rebased with latest main as well, ready to merge when you have a moment. Thanks! |
shadcn
approved these changes
Mar 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds the
@flxregistry entry to the registry directory.Homepage: https://ui.flexnative.com
Registry URL: https://ui.flexnative.com/r/{name}.json
Description: A collection of customizable UI blocks with interactive live previews.