Skip to content

chore: resolve merge conflicts with main - #16724

Merged
Rich-Harris merged 3 commits into
version-3from
chore-merge-main-2
Aug 11, 2026
Merged

chore: resolve merge conflicts with main#16724
Rich-Harris merged 3 commits into
version-3from
chore-merge-main-2

Conversation

@teemingc

Copy link
Copy Markdown
Member

No description provided.

teemingc and others added 2 commits August 6, 2026 12:10
Don't think these will run for us on the `version-3` branch unless
they're also on the `main` branch

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@pkg-svelte-dev

pkg-svelte-dev Bot commented Aug 11, 2026

Copy link
Copy Markdown

Install the latest version of @sveltejs/kit from 31c6b86:

pnpm add https://pkg.svelte.dev/@sveltejs/kit/c/31c6b86077e56b177f681a432c137e10cf8032f7

Open in pkg.svelte.dev: https://pkg.svelte.dev/repos/kit/pr/16724

@changeset-bot

changeset-bot Bot commented Aug 11, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 31c6b86

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

@svelte-docs-bot

Copy link
Copy Markdown

@Rich-Harris
Rich-Harris merged commit 74a7552 into version-3 Aug 11, 2026
6 of 7 checks passed
@Rich-Harris
Rich-Harris deleted the chore-merge-main-2 branch August 11, 2026 09:33
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