Skip to content

Conversation

ScriptedAlchemy
Copy link
Collaborator

No description provided.

@ScriptedAlchemy ScriptedAlchemy changed the base branch from main to federation March 23, 2025 21:54
# Conflicts:
#	examples/default-template/package.json
#	pnpm-lock.yaml
# Conflicts:
#	examples/cloudflare/package.json
#	examples/custom-node-server/package.json
#	examples/default-template/package.json
#	examples/epic-stack/package-lock.json
#	examples/epic-stack/package.json
#	package.json
#	pnpm-lock.yaml
#	src/index.ts
# Conflicts:
#	pnpm-lock.yaml
#	src/index.ts
#	src/modify-browser-manifest.ts
#	src/server-utils.ts
# Conflicts:
#	pnpm-lock.yaml
#	src/index.ts
#	src/server-utils.ts
# Conflicts:
#	examples/federation/epic-stack-remote/rsbuild.config.ts
#	examples/federation/epic-stack/rsbuild.config.ts
Base automatically changed from federation to main March 24, 2025 04:50
# Conflicts:
#	examples/epic-stack/app/routes/_auth+/login.tsx
#	examples/federation/epic-stack-remote/rsbuild.config.ts
#	examples/federation/epic-stack/rsbuild.config.ts
#	examples/federation/epic-stack/tests/e2e/search.test.ts
#	examples/federation/epic-stack/tests/e2e/settings-profile.test.ts
#	pnpm-lock.yaml
@ScriptedAlchemy ScriptedAlchemy force-pushed the main branch 6 times, most recently from d399d3d to be16d0f Compare March 24, 2025 06:15
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.

1 participant