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

Fix after sync from main #12388

Conversation

SarahFrench
Copy link
Contributor

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.


@SarahFrench SarahFrench changed the base branch from main to FEATURE-BRANCH-ephemeral-resource November 21, 2024 20:42
@SarahFrench SarahFrench requested a review from BBBmau November 21, 2024 20:42
@SarahFrench SarahFrench marked this pull request as ready for review November 21, 2024 20:42
@SarahFrench
Copy link
Contributor Author

Ahhh I think we need to have another sync from main - there's an error in the downstream generation build that's complaining about deleted files (mmv1/third_party/terraform/fwtransport/framework_provider_clients.go.tmpl, and mmv1/third_party/terraform/fwtransport/framework_config.go.tmpl) that were deleted by merging #11578 into main branch.

I didn't think main branch would be relevant to this PR that's merging into a feature branch

@SarahFrench
Copy link
Contributor Author

Being replaced by some commits in #12389

@SarahFrench SarahFrench deleted the fix-mux-after-sync-from-main branch November 22, 2024 19:05
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