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

next: resolve merge conflicts with main #639

Merged
merged 24 commits into from
Aug 3, 2024
Merged

next: resolve merge conflicts with main #639

merged 24 commits into from
Aug 3, 2024

Conversation

huntabyte
Copy link
Owner

@huntabyte huntabyte commented Aug 3, 2024

Wow, it's been 4 months since we've merged main into next

huntabyte and others added 24 commits April 12, 2024 19:51
Co-authored-by: Andre Morise <andre.morise@pax.us>
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* docs: fix ScrollArea import

* style: Use double quotes
Copy link

changeset-bot bot commented Aug 3, 2024

⚠️ No Changeset found

Latest commit: e2d75cc

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

github-actions bot commented Aug 3, 2024

built with Refined Cloudflare Pages Action

⚡ Cloudflare Pages Deployment

Name Status Preview Last Commit
bits-ui ✅ Ready (View Log) Visit Preview e2d75cc

@huntabyte huntabyte added the publish:preview Add to PRs to publish preview packages with `pkg-pr-new` label Aug 3, 2024
Copy link

pkg-pr-new bot commented Aug 3, 2024

commit: e2d75cc

pnpm add https://pkg.pr.new/bits-ui@639

Open in Stackblitz

@huntabyte huntabyte merged commit 578fd7b into next Aug 3, 2024
7 checks passed
@huntabyte huntabyte deleted the next-main-merged branch September 24, 2024 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
publish:preview Add to PRs to publish preview packages with `pkg-pr-new`
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants